diff options
| author | bors <bors@rust-lang.org> | 2022-01-29 09:01:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-29 09:01:01 +0000 |
| commit | ca43894e0e350af2245ba7d9ad8b6e31e0d4786d (patch) | |
| tree | 693a171e9d41ea80ecb9ca2c6f3f7e88d6c9dbff /library/std/src/sys | |
| parent | 24ae9960c5116a6d1e827c58327e6d231e4fe174 (diff) | |
| parent | 8c9944c50d9e5bce19e1a787b035356461935c4d (diff) | |
| download | rust-ca43894e0e350af2245ba7d9ad8b6e31e0d4786d.tar.gz rust-ca43894e0e350af2245ba7d9ad8b6e31e0d4786d.zip | |
Auto merge of #93351 - anp:fuchsia-remove-dir-all, r=tmandry
Bump libc and fix remove_dir_all on Fuchsia after CVE fix With the previous `is_dir` impl, we would attempt to unlink a directory in the None branch, but Fuchsia supports returning ENOTEMPTY from unlinkat() without the AT_REMOVEDIR flag because we don't currently differentiate unlinking files and directories by default. On the Fuchsia side I've opened https://fxbug.dev/92273 to discuss whether this is the correct behavior, but it doesn't seem like addressing the error code is necessary to make our tests happy. Depends on https://github.com/rust-lang/libc/pull/2654 since we apparently haven't needed to reference DT_UNKNOWN before this.
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/unix/fs.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs index 3bb80b45848..5b2199c2b7f 100644 --- a/library/std/src/sys/unix/fs.rs +++ b/library/std/src/sys/unix/fs.rs @@ -1653,7 +1653,6 @@ mod remove_dir_impl { target_os = "illumos", target_os = "haiku", target_os = "vxworks", - target_os = "fuchsia" ))] fn is_dir(_ent: &DirEntry) -> Option<bool> { None @@ -1664,7 +1663,6 @@ mod remove_dir_impl { target_os = "illumos", target_os = "haiku", target_os = "vxworks", - target_os = "fuchsia" )))] fn is_dir(ent: &DirEntry) -> Option<bool> { match ent.entry.d_type { |