update cargo tests to match lint message changes from rust-lang/rust#140794

Author: karolzwolak

tests/testsuite/fix.rs

@@ -1863,9 +1863,13 @@ fn non_edition_lint_migration() {
         .with_stderr_data(str![[r#"
 ...
 [..]use std::str::from_utf8;
-...
-  = [NOTE] `#[warn(unused_imports)]` on by default
-...
+  |                     ^^^^^^^^^^^^^^^^^^^
+  |
+  = [NOTE] `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
+
+[WARNING] `foo` (lib) generated 1 warning (run `cargo fix --lib -p foo` to apply 1 suggestion)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+
 "#]])
         .run();
     p.cargo("fix --edition --allow-no-vcs").run();

tests/testsuite/warning_override.rs

@@ -48,7 +48,7 @@ fn rustc_caching_allow_first() {
 1 | fn main() { let x = 3; }
   |                 ^ [HELP] if this is intentional, prefix it with an underscore: `_x`
   |
-  = [NOTE] `#[warn(unused_variables)]` on by default
+  = [NOTE] `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
 
 [WARNING] `foo` (bin "foo") generated 1 warning
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
@@ -75,7 +75,7 @@ fn rustc_caching_deny_first() {
 1 | fn main() { let x = 3; }
   |                 ^ [HELP] if this is intentional, prefix it with an underscore: `_x`
   |
-  = [NOTE] `#[warn(unused_variables)]` on by default
+  = [NOTE] `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
 
 [WARNING] `foo` (bin "foo") generated 1 warning
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
@@ -112,7 +112,7 @@ fn config() {
 1 | fn main() { let x = 3; }
   |                 ^ [HELP] if this is intentional, prefix it with an underscore: `_x`
   |
-  = [NOTE] `#[warn(unused_variables)]` on by default
+  = [NOTE] `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
 
 [WARNING] `foo` (bin "foo") generated 1 warning
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
@@ -136,7 +136,7 @@ fn config() {
 1 | fn main() { let x = 3; }
   |                 ^ [HELP] if this is intentional, prefix it with an underscore: `_x`
   |
-  = [NOTE] `#[warn(unused_variables)]` on by default
+  = [NOTE] `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
 
 [WARNING] `foo` (bin "foo") generated 1 warning
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
@@ -160,7 +160,7 @@ fn requires_nightly() {
 1 | fn main() { let x = 3; }
   |                 ^ [HELP] if this is intentional, prefix it with an underscore: `_x`
   |
-  = [NOTE] `#[warn(unused_variables)]` on by default
+  = [NOTE] `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
 
 [WARNING] `foo` (bin "foo") generated 1 warning
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s