Skip to content

Commit 6d4cc56

Browse files
committed
Auto merge of rust-lang#5461 - phansch:disable_rustfmt_integration_test, r=matthiaskrgr
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#71077 changelog: none
2 parents e29d550 + a4deb5a commit 6d4cc56

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/clippy_bors.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ jobs:
234234
- 'rust-lang/cargo'
235235
- 'rust-lang/rls'
236236
- 'rust-lang/chalk'
237-
- 'rust-lang/rustfmt'
237+
# FIXME: Disabled until https://github.com/rust-lang/rust/issues/71077 is fixed
238+
# - 'rust-lang/rustfmt'
238239
- 'Marwes/combine'
239240
- 'Geal/nom'
240241
- 'rust-lang/stdarch'

tests/integration.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ fn integration_test() {
6464
} else if stderr.contains("query stack during panic") {
6565
panic!("query stack during panic in the output");
6666
} else if stderr.contains("E0463") {
67+
// Encountering E0463 (can't find crate for `x`) did _not_ cause the build to fail in the
68+
// past. Even though it should have. That's why we explicitly panic here.
69+
// See PR #3552 and issue #3523 for more background.
6770
panic!("error: E0463");
6871
} else if stderr.contains("E0514") {
6972
panic!("incompatible crate versions");

0 commit comments

Comments
 (0)