Skip to content

Commit

Permalink
Auto merge of #5461 - phansch:disable_rustfmt_integration_test, r=mat…
Browse files Browse the repository at this point in the history
…thiaskrgr

Temporarily disable rustfmt integration test

Running rustfmt from master is currently broken and [fails our bors build](https://github.com/rust-lang/rust-clippy/runs/582066368#step:10:19):
rust-lang/rust#71077

changelog: none
  • Loading branch information
bors committed Apr 13, 2020
2 parents e29d550 + a4deb5a commit 6d4cc56
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/clippy_bors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ jobs:
- 'rust-lang/cargo'
- 'rust-lang/rls'
- 'rust-lang/chalk'
- 'rust-lang/rustfmt'
# FIXME: Disabled until https://github.com/rust-lang/rust/issues/71077 is fixed
# - 'rust-lang/rustfmt'
- 'Marwes/combine'
- 'Geal/nom'
- 'rust-lang/stdarch'
Expand Down
3 changes: 3 additions & 0 deletions tests/integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ fn integration_test() {
} else if stderr.contains("query stack during panic") {
panic!("query stack during panic in the output");
} else if stderr.contains("E0463") {
// Encountering E0463 (can't find crate for `x`) did _not_ cause the build to fail in the
// past. Even though it should have. That's why we explicitly panic here.
// See PR #3552 and issue #3523 for more background.
panic!("error: E0463");
} else if stderr.contains("E0514") {
panic!("incompatible crate versions");
Expand Down

0 comments on commit 6d4cc56

Please sign in to comment.