replace remove_dir with remove_dir_all in helpers::symlink_dir

onur-ozkan · onur-ozkan · commit f76c3b7fb971 · 2024-06-18T13:28:29.000+03:00
When using `symlink_dir`, it first removes the existing link with `remove_dir`.
However, if the path isn't a link and contains files, `remove_dir` fails
with "DirectoryNotEmpty", which causes the symbolic linking to fail as well.
We have this problem on linking 'rustlib/rust' because it contains files as an
actual directory.

Signed-off-by: onur-ozkan &lt;work@onurozkan.dev&gt;
diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
@@ -135,7 +135,7 @@ pub fn symlink_dir(config: &Config, original: &Path, link: &Path) -> io::Result<
     if config.dry_run() {
         return Ok(());
     }
-    let _ = fs::remove_dir(link);
+    let _ = fs::remove_dir_all(link);
     return symlink_dir_inner(original, link);
 
     #[cfg(not(windows))]

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ pub fn symlink_dir(config: &Config, original: &Path, link: &Path) -> io::Result<`
`135`	`135`	`if config.dry_run() {`
`136`	`136`	`return Ok(());`
`137`	`137`	`}`
`138`		`- let _ = fs::remove_dir(link);`
	`138`	`+ let _ = fs::remove_dir_all(link);`
`139`	`139`	`return symlink_dir_inner(original, link);`
`140`	`140`
`141`	`141`	`#[cfg(not(windows))]`