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 Oct 8, 2020
2 parents 171ab9b + fded020 commit a9045b7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/clippy_bors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
env:
RUST_BACKTRACE: 1
CARGO_TARGET_DIR: '${{ github.workspace }}/target'
NO_FMT_TEST: 1

jobs:
changelog:
Expand Down Expand Up @@ -86,6 +85,7 @@ jobs:
toolchain: nightly
target: ${{ matrix.host }}
profile: minimal
components: rustfmt

- name: Checkout
uses: actions/[email protected]
Expand Down
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 a9045b7

Please sign in to comment.