Skip to content

Commit

Permalink
Auto merge of #6083 - mikerite:dev-fmt-20200925, r=<try>
Browse files Browse the repository at this point in the history
Remove rustfmt bug workaround

rust-lang/rustfmt#1873 was fixed earlier this year.

changelog: none
  • Loading branch information
bors committed Sep 25, 2020
2 parents cc1998f + c8b9093 commit f42f7a0
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions clippy_dev/src/fmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit f42f7a0

Please sign in to comment.