Skip to content

Commit 479b7c4

Browse files
committed
Auto merge of #14341 - estebank:test-short-message-change, r=weihanglo
Change tests to support `rustc` wording changes With rust-lang/rust#126818 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`. Follow up to #14135. Noticed in https://github.com/rust-lang-ci/rust/actions/runs/10192263962/job/28194880547#step:25:7529 when trying to land rust-lang/rust#126818.
2 parents 354f9b2 + 830db6f commit 479b7c4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/testsuite/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ fn short_message_format() {
819819
.with_status(101)
820820
.with_stderr_data(str![[r#"
821821
[CHECKING] foo v0.0.1 ([ROOT]/foo)
822-
src/lib.rs:1:27: error[E0308]: mismatched types
822+
src/lib.rs:1:27: error[E0308]: mismatched types[..]
823823
[ERROR] could not compile `foo` (lib) due to 1 previous error
824824
825825
"#]])

0 commit comments

Comments
 (0)