refactor(utils)!: rename delete_dir_contents() to `delete_dir_conte…

…nts_following_links()`
rust-lang · Apr 9, 2024 · 68db1c4 · 68db1c4
1 parent cb27b9b
commit 68db1c4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
@@ -1007,7 +1007,7 @@ fn update(cfg: &mut Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
     } else {
         common::update_all_channels(cfg, self_update, m.get_flag("force"))?;
         info!("cleaning up downloads & tmp directories");
-        utils::delete_dir_contents(&cfg.download_dir);
+        utils::delete_dir_contents_following_links(&cfg.download_dir);
         cfg.temp_cfg.clean();
     }
 

diff --git a/src/dist/temp.rs b/src/dist/temp.rs
@@ -158,7 +158,7 @@ impl Cfg {
     }
 
     pub(crate) fn clean(&self) {
-        utils::delete_dir_contents(&self.root_directory);
+        utils::delete_dir_contents_following_links(&self.root_directory);
     }
 }
 

diff --git a/src/utils/utils.rs b/src/utils/utils.rs
@@ -610,7 +610,7 @@ where
     })
 }
 
-pub(crate) fn delete_dir_contents(dir_path: &Path) {
+pub(crate) fn delete_dir_contents_following_links(dir_path: &Path) {
     use remove_dir_all::RemoveDir;
 
     match raw::open_dir_following_links(dir_path).and_then(|mut p| p.remove_dir_contents(None)) {