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 99cc250

Browse files
committedMar 4, 2025
Auto merge of rust-lang#137982 - matthiaskrgr:rollup-12jvilg, r=matthiaskrgr
Rollup of 12 pull requests Successful merges: - rust-lang#136975 (Look for `python3` first on MacOS, not `py`) - rust-lang#137240 (Slightly reformat `std::fs::remove_dir_all` error docs) - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion) - rust-lang#137463 ([illumos] attempt to use posix_spawn to spawn processes) - rust-lang#137722 (`librustdoc`: 2024 edition! 🎊) - rust-lang#137758 (fix usage of ty decl macro fragments in attributes) - rust-lang#137772 (Fix char count in `Display` for `ByteStr`) - rust-lang#137805 (adjust Layout debug printing to match the internal field name) - rust-lang#137808 (Do not require that unsafe fields lack drop glue) - rust-lang#137913 (Allow struct field default values to reference struct's generics) - rust-lang#137963 (Add ``dyn`` keyword to `E0373` examples) - rust-lang#137975 (Remove unused `PpMode::needs_hir`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents fd17dea + 98c6bd4 commit 99cc250

File tree

66 files changed

+636
-809
lines changed

Some content is hidden

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

66 files changed

+636
-809
lines changed
 

‎library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ miniz_oxide = { version = "0.8.0", optional = true, default-features = false }
3535
addr2line = { version = "0.24.0", optional = true, default-features = false }
3636

3737
[target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
38-
libc = { version = "0.2.169", default-features = false, features = [
38+
libc = { version = "0.2.170", default-features = false, features = [
3939
'rustc-dep-of-std',
4040
], public = true }
4141

‎library/std/src/fs.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -2857,9 +2857,11 @@ pub fn remove_dir<P: AsRef<Path>>(path: P) -> io::Result<()> {
28572857
///
28582858
/// See [`fs::remove_file`] and [`fs::remove_dir`].
28592859
///
2860-
/// `remove_dir_all` will fail if `remove_dir` or `remove_file` fail on any constituent paths, including the root `path`.
2861-
/// As a result, the directory you are deleting must exist, meaning that this function is not idempotent.
2862-
/// Additionally, `remove_dir_all` will also fail if the `path` is not a directory.
2860+
/// [`remove_dir_all`] will fail if [`remove_dir`] or [`remove_file`] fail on *any* constituent
2861+
/// paths, *including* the root `path`. Consequently,
2862+
///
2863+
/// - The directory you are deleting *must* exist, meaning that this function is *not idempotent*.
2864+
/// - [`remove_dir_all`] will fail if the `path` is *not* a directory.
28632865
///
28642866
/// Consider ignoring the error if validating the removal is not required for your use case.
28652867
///
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.