Auto merge of #7386 - camsteffen:fmt-workaround, r=flip1995

Remove rustfmt bug workaround

The bug is reportedly fixed.

changelog: none
This commit is contained in:
bors 2021-06-21 17:01:51 +00:00
commit a8b374fefb

View File

@ -60,11 +60,7 @@ fn try_run(context: &FmtContext) -> Result<bool, CliError> {
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;
}