Skip to content

Commit

Permalink
Auto merge of #14341 - estebank:test-short-message-change, r=weihanglo
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Aug 1, 2024
2 parents 354f9b2 + 830db6f commit 479b7c4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/testsuite/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,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
"#]])
Expand Down

0 comments on commit 479b7c4

Please sign in to comment.