Retry deleting dst a number of times

Author: ChrisDenton

src/bootstrap/src/lib.rs

@@ -1676,7 +1676,7 @@ impl Build {
         if src == dst {
             return;
         }
-        let _ = fs::remove_file(dst);
+        let _ = rety(60, || fs::remove_file(dst));
         let metadata = t!(src.symlink_metadata(), format!("src = {}", src.display()));
         let mut src = src.to_path_buf();
         if metadata.file_type().is_symlink() {
@@ -1688,25 +1688,18 @@ impl Build {
                 return;
             }
         }
-        // workaround for https://github.com/rust-lang/rust/issues/127126
-        // retry linking or copying up to 10 times or until success.
-        let result: io::Result<()> = retry(10, || {
-            if let Ok(()) = fs::hard_link(&src, dst) {
-                // Attempt to "easy copy" by creating a hard link
-                // (symlinks don't work on windows), but if that fails
-                // just fall back to a slow `copy` operation.
-                Ok(())
-            } else {
-                fs::copy(&src, dst)?;
-                t!(fs::set_permissions(dst, metadata.permissions()));
-                let atime = FileTime::from_last_access_time(&metadata);
-                let mtime = FileTime::from_last_modification_time(&metadata);
-                t!(filetime::set_file_times(dst, atime, mtime));
-                Ok(())
+        if let Ok(()) = fs::hard_link(&src, dst) {
+            // Attempt to "easy copy" by creating a hard link
+            // (symlinks don't work on windows), but if that fails
+            // just fall back to a slow `copy` operation.
+        } else {
+            if let Err(e) = fs::copy(&src, dst) {
+                panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
             }
-        });
-        if let Err(e) = result {
-            panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
+            t!(fs::set_permissions(dst, metadata.permissions()));
+            let atime = FileTime::from_last_access_time(&metadata);
+            let mtime = FileTime::from_last_modification_time(&metadata);
+            t!(filetime::set_file_times(dst, atime, mtime));
         }
     }