Skip to content

Commit a9045b7

Browse files
committed
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
2 parents 171ab9b + fded020 commit a9045b7

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/workflows/clippy_bors.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
env:
1010
RUST_BACKTRACE: 1
1111
CARGO_TARGET_DIR: '${{ github.workspace }}/target'
12-
NO_FMT_TEST: 1
1312

1413
jobs:
1514
changelog:
@@ -86,6 +85,7 @@ jobs:
8685
toolchain: nightly
8786
target: ${{ matrix.host }}
8887
profile: minimal
88+
components: rustfmt
8989

9090
- name: Checkout
9191
uses: actions/[email protected]

clippy_dev/src/fmt.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ pub fn run(check: bool, verbose: bool) {
4747
let entry = entry?;
4848
let path = entry.path();
4949

50-
if path.extension() != Some("rs".as_ref())
51-
|| entry.file_name() == "ice-3891.rs"
52-
// Avoid rustfmt bug rust-lang/rustfmt#1873
53-
|| cfg!(windows) && entry.file_name() == "implicit_hasher.rs"
54-
{
50+
if path.extension() != Some("rs".as_ref()) || entry.file_name() == "ice-3891.rs" {
5551
continue;
5652
}
5753

0 commit comments

Comments
 (0)