about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-06-21 17:01:51 +0000
committerbors <bors@rust-lang.org>2021-06-21 17:01:51 +0000
commita8b374fefb9056ace1c23944805f6a05061e597d (patch)
treed381749e695a21222d585045c6c8d3e1084bca1c
parent86bf28dfab88118a22e5c9b46ac7d9634ac54908 (diff)
parent206bb08d10a7c4813f8bc087bc26c6dc0e8eacff (diff)
downloadrust-a8b374fefb9056ace1c23944805f6a05061e597d.tar.gz
rust-a8b374fefb9056ace1c23944805f6a05061e597d.zip
Auto merge of #7386 - camsteffen:fmt-workaround, r=flip1995
Remove rustfmt bug workaround

The bug is reportedly fixed.

changelog: none
-rw-r--r--clippy_dev/src/fmt.rs6
1 files changed, 1 insertions, 5 deletions
diff --git a/clippy_dev/src/fmt.rs b/clippy_dev/src/fmt.rs
index 1517cdc9419..edc8e6a629c 100644
--- a/clippy_dev/src/fmt.rs
+++ b/clippy_dev/src/fmt.rs
@@ -60,11 +60,7 @@ pub fn run(check: bool, verbose: bool) {
             let entry = entry?;
             let path = entry.path();
 
-            if path.extension() != Some("rs".as_ref())
-                || entry.file_name() == "ice-3891.rs"
-                // Avoid rustfmt bug rust-lang/rustfmt#1873
-                || cfg!(windows) && entry.file_name() == "implicit_hasher.rs"
-            {
+            if path.extension() != Some("rs".as_ref()) || entry.file_name() == "ice-3891.rs" {
                 continue;
             }