From 8ad1d780e98d3c9be2cc69a012ca105d4a500e99 Mon Sep 17 00:00:00 2001 From: Philipp Hansch Date: Mon, 13 Apr 2020 15:31:39 +0200 Subject: [PATCH 1/2] Temporarily disable rustfmt integration test Running rustfmt from master is currently broken: https://github.com/rust-lang/rust/issues/71077 --- .github/workflows/clippy_bors.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index 6675a1029..3b1774e03 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -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' From a4deb5aca55fc1ab18e6c017181dd3f892c614f6 Mon Sep 17 00:00:00 2001 From: Philipp Hansch Date: Mon, 13 Apr 2020 22:12:57 +0200 Subject: [PATCH 2/2] Explain panic on `E0463` in integration tests --- tests/integration.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integration.rs b/tests/integration.rs index 4f373e034..a78273ce0 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -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");