mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-23 21:23:56 +00:00
Auto merge of #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): https://github.com/rust-lang/rust/issues/71077 changelog: none
This commit is contained in:
commit
6d4cc56703
2 changed files with 5 additions and 1 deletions
3
.github/workflows/clippy_bors.yml
vendored
3
.github/workflows/clippy_bors.yml
vendored
|
@ -234,7 +234,8 @@ jobs:
|
||||||
- 'rust-lang/cargo'
|
- 'rust-lang/cargo'
|
||||||
- 'rust-lang/rls'
|
- 'rust-lang/rls'
|
||||||
- 'rust-lang/chalk'
|
- 'rust-lang/chalk'
|
||||||
- 'rust-lang/rustfmt'
|
# FIXME: Disabled until https://github.com/rust-lang/rust/issues/71077 is fixed
|
||||||
|
# - 'rust-lang/rustfmt'
|
||||||
- 'Marwes/combine'
|
- 'Marwes/combine'
|
||||||
- 'Geal/nom'
|
- 'Geal/nom'
|
||||||
- 'rust-lang/stdarch'
|
- 'rust-lang/stdarch'
|
||||||
|
|
|
@ -64,6 +64,9 @@ fn integration_test() {
|
||||||
} else if stderr.contains("query stack during panic") {
|
} else if stderr.contains("query stack during panic") {
|
||||||
panic!("query stack during panic in the output");
|
panic!("query stack during panic in the output");
|
||||||
} else if stderr.contains("E0463") {
|
} 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");
|
panic!("error: E0463");
|
||||||
} else if stderr.contains("E0514") {
|
} else if stderr.contains("E0514") {
|
||||||
panic!("incompatible crate versions");
|
panic!("incompatible crate versions");
|
||||||
|
|
Loading…
Reference in a new issue