Skip to content

Bootstrap: Try renaming the file if removing fails #127152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 2, 2024
Merged

Bootstrap: Try renaming the file if removing fails #127152

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d6cc60
Try renaming the file if removing fails
ChrisDenton Jun 30, 2024
b998cff
Use `cfg!(windows)`
ChrisDenton Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/bootstrap/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};
use std::str;
use std::sync::OnceLock;
use std::time::SystemTime;

use build_helper::ci::{gha, CiEnv};
use build_helper::exit;
Expand Down Expand Up @@ -1676,7 +1677,14 @@ impl Build {
if src == dst {
return;
}
let _ = fs::remove_file(dst);
if let Err(e) = fs::remove_file(dst) {
if e.kind() != io::ErrorKind::NotFound {
// workaround for https://github.com/rust-lang/rust/issues/127126
// if removing the file fails, attempt to rename it instead.
let now = t!(SystemTime::now().duration_since(SystemTime::UNIX_EPOCH));
let _ = fs::rename(dst, format!("{}-{}", dst.display(), now.as_nanos()));
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like a good use case #[cfg(windows)].

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used cfg!(windows) if that's alright as it's easier to integrate.

let metadata = t!(src.symlink_metadata(), format!("src = {}", src.display()));
let mut src = src.to_path_buf();
if metadata.file_type().is_symlink() {
Expand Down