Auto merge of #14135 - estebank:relax-test-check, r=weihanglo

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`.

Author: bors

tests/testsuite/check.rs

@@ -347,7 +347,8 @@ fn rustc_check_err() {
         .with_status(101)
         .with_stderr_contains("[CHECKING] bar [..]")
         .with_stderr_contains("[CHECKING] foo [..]")
-        .with_stderr_contains("[..]cannot find function `qux` in [..] `bar`")
+        .with_stderr_contains("[..]cannot find function `qux`[..]")
+        .with_stderr_contains("[..]in crate `bar`")
         .run();
 }
 

tests/testsuite/message_format.rs

@@ -138,7 +138,7 @@ test src/lib.rs - bar (line 1) ... FAILED
 failures:
 
 ---- src/lib.rs - bar (line 1) stdout ----
-src/lib.rs:2:1: error[E0425]: cannot find function `bar` in this scope
+src/lib.rs:2:1: error[E0425]: cannot find function `bar`[..]
 [ERROR] aborting due to 1 previous error
 Couldn't compile the test.
 

tests/testsuite/metabuild.rs

@@ -765,7 +765,7 @@ fn metabuild_failed_build_json() {
                 "children": "{...}",
                 "code": "{...}",
                 "level": "error",
-                "message": "cannot find function `metabuild` in [..] `mb`",
+                "message": "cannot find function `metabuild`[..]",
                 "rendered": "{...}",
                 "spans": "{...}"
               },

tests/testsuite/replace.rs

@@ -1443,7 +1443,7 @@ fn override_respects_spec_metadata() {
 [DOWNLOADED] bar v0.1.0+a (registry `dummy-registry`)
 [CHECKING] bar v0.1.0+a
 [CHECKING] foo v0.0.1 ([ROOT]/foo)
-error[E0425]: cannot find function `bar` in crate `bar`
+error[E0425]: cannot find function `bar`[..]
 ...
 [ERROR] could not compile `foo` (lib) due to 1 previous error