diff options
| author | bors <bors@rust-lang.org> | 2021-12-11 03:52:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-11 03:52:12 +0000 |
| commit | c185610ebc19a0fc22e68472483dc69ea10b92fd (patch) | |
| tree | 6efde3cd2f3283600d3bd97a54a5b87ce3b21f37 /src/bootstrap/clean.rs | |
| parent | 82575a1d6f02a3932fcfa36562368f5e095d93ba (diff) | |
| parent | 637859b26ef431b2533d257184bd7a74ae278f8c (diff) | |
Auto merge of #91761 - matthiaskrgr:rollup-bjowmvz, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - #91668 (Remove the match on `ErrorKind::Other`) - #91678 (Add tests fixed by #90023) - #91679 (Move core/stream/stream/mod.rs to core/stream/stream.rs) - #91681 (fix typo in `intrinsics::raw_eq` docs) - #91686 (Fix `Vec::reserve_exact` documentation) - #91697 (Delete Utf8Lossy::from_str) - #91706 (Add unstable book entries for parts of asm that are not being stabilized) - #91709 (Replace iterator-based set construction by *Set::From<[T; N]>) - #91716 (Improve x.py logging and defaults a bit more) - #91747 (Add pierwill to .mailmap) - #91755 (Fix since attribute for const_linked_list_new feature) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap/clean.rs')
| -rw-r--r-- | src/bootstrap/clean.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/clean.rs b/src/bootstrap/clean.rs index 3216c1af267..3b73dc1c7df 100644 --- a/src/bootstrap/clean.rs +++ b/src/bootstrap/clean.rs @@ -75,10 +75,10 @@ fn rm_rf(path: &Path) { do_op(path, "remove dir", |p| { fs::remove_dir(p).or_else(|e| { // Check for dir not empty on Windows + // FIXME: Once `ErrorKind::DirectoryNotEmpty` is stabilized, + // match on `e.kind()` instead. #[cfg(windows)] - if matches!(e.kind(), std::io::ErrorKind::Other) - && e.raw_os_error() == Some(145) - { + if e.raw_os_error() == Some(145) { return Ok(()); } |
