From d886e7bb39f3587cfd4e29e4c5811d9907511c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Thu, 1 Aug 2024 18:10:56 +0000 Subject: [PATCH] Change tests to support `rustc` wording changes Between rust-lang/rust#126810 and rust-lang/rust#126810 the output of rustc for resolution errors is going to change in such a way that some existing cargo tests will fail. Change them to support both the current and future output, so that those PRs can land in `rustc`. --- tests/testsuite/check.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testsuite/check.rs b/tests/testsuite/check.rs index b3377b1f88fd..a3c832f851ee 100644 --- a/tests/testsuite/check.rs +++ b/tests/testsuite/check.rs @@ -820,7 +820,7 @@ fn short_message_format() { .with_status(101) .with_stderr_data(str![[r#" [CHECKING] foo v0.0.1 ([ROOT]/foo) -src/lib.rs:1:27: error[E0308]: mismatched types +src/lib.rs:1:27: error[E0308]: mismatched types[..] [ERROR] could not compile `foo` (lib) due to 1 previous error "#]])