Skip to content

Commit

Permalink
Rollup merge of #91668 - ChrisDenton:bootstrap-clean-error, r=Mark-Si…
Browse files Browse the repository at this point in the history
…mulacrum

Remove the match on `ErrorKind::Other`

It's a) superfluous and b) doesn't work any more.
  • Loading branch information
matthiaskrgr committed Dec 10, 2021
2 parents 0b42dea + caed83d commit 0aa41be
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/bootstrap/clean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(());
}

Expand Down

0 comments on commit 0aa41be

Please sign in to comment.