refactor(util)!: rename open_dir() to open_dir_following_links()

Author: rami3l

src/toolchain/toolchain.rs

@@ -19,7 +19,7 @@ use crate::{
     currentprocess::{process, varsource::VarSource},
     env_var, install,
     notifications::Notification,
-    utils::{raw::open_dir, utils},
+    utils::{raw::open_dir_following_links, utils},
     RustupError,
 };
 
@@ -62,7 +62,7 @@ impl<'a> Toolchain<'a> {
         let base_name = path
             .file_name()
             .ok_or_else(|| RustupError::InvalidToolchainName(name.to_string()))?;
-        let parent_dir = match open_dir(parent) {
+        let parent_dir = match open_dir_following_links(parent) {
             Ok(d) => d,
             Err(e) if e.kind() == io::ErrorKind::NotFound => return Ok(false),
             e => e?,

src/utils/raw.rs

@@ -31,7 +31,7 @@ pub fn is_file<P: AsRef<Path>>(path: P) -> bool {
 }
 
 #[cfg(windows)]
-pub fn open_dir(p: &Path) -> std::io::Result<File> {
+pub fn open_dir_following_links(p: &Path) -> std::io::Result<File> {
     use std::fs::OpenOptions;
     use std::os::windows::fs::OpenOptionsExt;
 
@@ -42,8 +42,9 @@ pub fn open_dir(p: &Path) -> std::io::Result<File> {
     options.custom_flags(FILE_FLAG_BACKUP_SEMANTICS);
     options.open(p)
 }
+
 #[cfg(not(windows))]
-pub fn open_dir(p: &Path) -> std::io::Result<File> {
+pub fn open_dir_following_links(p: &Path) -> std::io::Result<File> {
     use std::fs::OpenOptions;
 
     let mut options = OpenOptions::new();