Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a0f01c3

Browse files
committedJun 22, 2024
Auto merge of #126838 - matthiaskrgr:rollup-qkop22o, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #126140 (Rename `std::fs::try_exists` to `std::fs::exists` and stabilize fs_try_exists) - #126318 (Add a `x perf` command for integrating bootstrap with `rustc-perf`) - #126552 (Remove use of const traits (and `feature(effects)`) from stdlib) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f944afe + dc9a08f commit a0f01c3

File tree

181 files changed

+2256
-337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+2256
-337
lines changed
 

‎library/std/src/sys/pal/windows/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1531,7 +1531,7 @@ pub fn junction_point(original: &Path, link: &Path) -> io::Result<()> {
15311531
}
15321532

15331533
// Try to see if a file exists but, unlike `exists`, report I/O errors.
1534-
pub fn try_exists(path: &Path) -> io::Result<bool> {
1534+
pub fn exists(path: &Path) -> io::Result<bool> {
15351535
// Open the file to ensure any symlinks are followed to their target.
15361536
let mut opts = OpenOptions::new();
15371537
// No read, write, etc access rights are needed.

‎library/std/src/sys_common/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn remove_dir_all_recursive(path: &Path) -> io::Result<()> {
4242
fs::remove_dir(path)
4343
}
4444

45-
pub fn try_exists(path: &Path) -> io::Result<bool> {
45+
pub fn exists(path: &Path) -> io::Result<bool> {
4646
match fs::metadata(path) {
4747
Ok(_) => Ok(true),
4848
Err(error) if error.kind() == io::ErrorKind::NotFound => Ok(false),

‎src/bootstrap/src/core/build_steps/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pub(crate) mod doc;
77
pub(crate) mod format;
88
pub(crate) mod install;
99
pub(crate) mod llvm;
10+
pub(crate) mod perf;
1011
pub(crate) mod run;
1112
pub(crate) mod setup;
1213
pub(crate) mod suggest;
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.