Auto merge of #6083 - mikerite:dev-fmt-20200925, r=<try>

Remove rustfmt bug workaround rust-lang/rustfmt#1873 was fixed earlier this year. changelog: none
rust-lang · Oct 8, 2020 · ca31ddf · ca31ddf
2 parents 13a80b3 + 7822e6c
commit ca31ddf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml
@@ -9,7 +9,6 @@ on:
 env:
   RUST_BACKTRACE: 1
   CARGO_TARGET_DIR: '${{ github.workspace }}/target'
-  NO_FMT_TEST: 1
 
 jobs:
   changelog:

diff --git a/clippy_dev/src/fmt.rs b/clippy_dev/src/fmt.rs
@@ -47,11 +47,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;
             }