From 20e282b98d9c1459e1fdffd7f450e7b9f6d8397f Mon Sep 17 00:00:00 2001
From: bors <bors@rust-lang.org>
Date: Thu, 23 Jun 2022 20:12:03 +0000
Subject: [PATCH] Auto merge of #10785 - ehuss:fix-dead_code-diag, r=Eh2406

Fix tests due to change in dead_code diagnostic.

https://github.com/rust-lang/rust/pull/97853 changed some diagnostics which is causing some tests to fail on the latest nightly.  This updates the tests to work on both stable and nightly.
---
 tests/testsuite/build.rs        | 4 ++--
 tests/testsuite/registry.rs     | 2 +-
 tests/testsuite/standard_lib.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
index 68f8e905b2b..4af550679d9 100644
--- a/tests/testsuite/build.rs
+++ b/tests/testsuite/build.rs
@@ -647,7 +647,7 @@ fn cargo_compile_with_warnings_in_the_root_package() {
         .build();
 
     p.cargo("build")
-        .with_stderr_contains("[..]function is never used: `dead`[..]")
+        .with_stderr_contains("[WARNING] [..]dead[..]")
         .run();
 }
 
@@ -686,7 +686,7 @@ fn cargo_compile_with_warnings_in_a_dep_package() {
         .build();
 
     p.cargo("build")
-        .with_stderr_contains("[..]function is never used: `dead`[..]")
+        .with_stderr_contains("[WARNING] [..]dead[..]")
         .run();
 
     assert!(p.bin("foo").is_file());
diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs
index f9afa2919c6..4ca028e15d4 100644
--- a/tests/testsuite/registry.rs
+++ b/tests/testsuite/registry.rs
@@ -1961,7 +1961,7 @@ fn upstream_warnings_on_extra_verbose(cargo: fn(&Project, &str) -> Execs) {
         .publish();
 
     cargo(&p, "build -vv")
-        .with_stderr_contains("[..]warning: function is never used[..]")
+        .with_stderr_contains("[WARNING] [..]unused[..]")
         .run();
 }
 
diff --git a/tests/testsuite/standard_lib.rs b/tests/testsuite/standard_lib.rs
index 07b038b4a5d..787c7e0c108 100644
--- a/tests/testsuite/standard_lib.rs
+++ b/tests/testsuite/standard_lib.rs
@@ -316,7 +316,7 @@ fn check_core() {
     p.cargo("check -v")
         .build_std_arg(&setup, "core")
         .target_host()
-        .with_stderr_contains("[WARNING] [..]unused_fn[..]`")
+        .with_stderr_contains("[WARNING] [..]unused_fn[..]")
         .run();
 }