about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2021-12-10 22:41:22 +0100
committerGitHub <noreply@github.com>2021-12-10 22:41:22 +0100
commit0aa41bea970785d7a13bbce48720cf920a8c3a56 (patch)
treea8efe7bf55f4e1cfce3c7d6bf202c036601bf2b1 /src/bootstrap
parent0b42deaccc2cbe17a68067aa5fdb76104369e1fd (diff)
parentcaed83d400b70ac5cd1d246c8cfdf1f9a5f888fe (diff)
downloadrust-0aa41bea970785d7a13bbce48720cf920a8c3a56.tar.gz
rust-0aa41bea970785d7a13bbce48720cf920a8c3a56.zip
Rollup merge of #91668 - ChrisDenton:bootstrap-clean-error, r=Mark-Simulacrum
Remove the match on `ErrorKind::Other`

It's a) superfluous and b) doesn't work any more.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/clean.rs6
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(());
                     }