Correct inconsistent error messages in tests

zbyrn · zbyrn · commit 545702e432fb · 2022-10-27T01:36:07.000-05:00
diff --git a/src/test/ui/const-generics/issues/issue-82956.stderr b/src/test/ui/const-generics/issues/issue-82956.stderr
@@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `IntoIter`
   --> $DIR/issue-82956.rs:25:24
    |
 LL |         let mut iter = IntoIter::new(self);
-   |                        ^^^^^^^^ not found in this scope
+   |                        ^^^^^^^^ use of undeclared type `IntoIter`
    |
 help: consider importing one of these items
    |
diff --git a/src/test/ui/derived-errors/issue-31997-1.stderr b/src/test/ui/derived-errors/issue-31997-1.stderr
@@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `HashMap`
   --> $DIR/issue-31997-1.rs:20:19
    |
 LL |     let mut map = HashMap::new();
-   |                   ^^^^^^^ not found in this scope
+   |                   ^^^^^^^ use of undeclared type `HashMap`
    |
 help: consider importing this struct
    |
diff --git a/src/test/ui/hygiene/no_implicit_prelude.stderr b/src/test/ui/hygiene/no_implicit_prelude.stderr
@@ -5,7 +5,7 @@ LL |     fn f() { ::bar::m!(); }
    |              ----------- in this macro invocation
 ...
 LL |         Vec::new();
-   |         ^^^ not found in this scope
+   |         ^^^ use of undeclared type `Vec`
    |
    = note: this error originates in the macro `::bar::m` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider importing this struct
diff --git a/src/test/ui/proc-macro/amputate-span.stderr b/src/test/ui/proc-macro/amputate-span.stderr
@@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `Command`
   --> $DIR/amputate-span.rs:49:5
    |
 LL |     Command::new("git");
-   |     ^^^^^^^ not found in this scope
+   |     ^^^^^^^ use of undeclared type `Command`
    |
 help: consider importing this struct
    |
@@ -13,7 +13,7 @@ error[E0433]: failed to resolve: use of undeclared type `Command`
   --> $DIR/amputate-span.rs:63:9
    |
 LL |         Command::new("git");
-   |         ^^^^^^^ not found in this scope
+   |         ^^^^^^^ use of undeclared type `Command`
    |
 help: consider importing this struct
    |
diff --git a/src/test/ui/resolve/missing-in-namespace.stderr b/src/test/ui/resolve/missing-in-namespace.stderr
@@ -1,8 +1,8 @@
 error[E0433]: failed to resolve: could not find `hahmap` in `std`
-  --> $DIR/missing-in-namespace.rs:2:29
+  --> $DIR/missing-in-namespace.rs:2:21
    |
 LL |     let _map = std::hahmap::HashMap::new();
-   |                             ^^^^^^^ not found in `std::hahmap`
+   |                     ^^^^^^ could not find `hahmap` in `std`
    |
 help: consider importing this struct
    |
diff --git a/src/test/ui/resolve/use_suggestion.stderr b/src/test/ui/resolve/use_suggestion.stderr
@@ -8,7 +8,7 @@ error[E0433]: failed to resolve: use of undeclared type `HashMap`
   --> $DIR/use_suggestion.rs:2:14
    |
 LL |     let x1 = HashMap::new();
-   |              ^^^^^^^ not found in this scope
+   |              ^^^^^^^ use of undeclared type `HashMap`
    |
 help: consider importing this struct
    |
diff --git a/src/test/ui/suggestions/core-std-import-order-issue-83564.stderr b/src/test/ui/suggestions/core-std-import-order-issue-83564.stderr
@@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `NonZeroU32`
   --> $DIR/core-std-import-order-issue-83564.rs:8:14
    |
 LL |     let _x = NonZeroU32::new(5).unwrap();
-   |              ^^^^^^^^^^ not found in this scope
+   |              ^^^^^^^^^^ use of undeclared type `NonZeroU32`
    |
 help: consider importing one of these items
    |
diff --git a/src/test/ui/suggestions/suggest-tryinto-edition-change.rs b/src/test/ui/suggestions/suggest-tryinto-edition-change.rs
@@ -10,18 +10,19 @@ fn test() {
 
     let _i: i16 = TryFrom::try_from(0_i32).unwrap();
     //~^ ERROR failed to resolve: use of undeclared type
-    //~| NOTE not found in this scope
+    //~| NOTE use of undeclared type
     //~| NOTE 'std::convert::TryFrom' is included in the prelude starting in Edition 2021
     //~| NOTE 'core::convert::TryFrom' is included in the prelude starting in Edition 2021
 
     let _i: i16 = TryInto::try_into(0_i32).unwrap();
     //~^ ERROR failed to resolve: use of undeclared type
-    //~| NOTE not found in this scope
+    //~| NOTE use of undeclared type
     //~| NOTE 'std::convert::TryInto' is included in the prelude starting in Edition 2021
     //~| NOTE 'core::convert::TryInto' is included in the prelude starting in Edition 2021
 
     let _v: Vec<_> = FromIterator::from_iter(&[1]);
     //~^ ERROR failed to resolve: use of undeclared type
+    //~| NOTE use of undeclared type
     //~| NOTE 'std::iter::FromIterator' is included in the prelude starting in Edition 2021
     //~| NOTE 'core::iter::FromIterator' is included in the prelude starting in Edition 2021
 }
diff --git a/src/test/ui/suggestions/suggest-tryinto-edition-change.stderr b/src/test/ui/suggestions/suggest-tryinto-edition-change.stderr
@@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `TryFrom`
   --> $DIR/suggest-tryinto-edition-change.rs:11:19
    |
 LL |     let _i: i16 = TryFrom::try_from(0_i32).unwrap();
-   |                   ^^^^^^^ not found in this scope
+   |                   ^^^^^^^ use of undeclared type `TryFrom`
    |
    = note: 'std::convert::TryFrom' is included in the prelude starting in Edition 2021
    = note: 'core::convert::TryFrom' is included in the prelude starting in Edition 2021
@@ -17,7 +17,7 @@ error[E0433]: failed to resolve: use of undeclared type `TryInto`
   --> $DIR/suggest-tryinto-edition-change.rs:17:19
    |
 LL |     let _i: i16 = TryInto::try_into(0_i32).unwrap();
-   |                   ^^^^^^^ not found in this scope
+   |                   ^^^^^^^ use of undeclared type `TryInto`
    |
    = note: 'std::convert::TryInto' is included in the prelude starting in Edition 2021
    = note: 'core::convert::TryInto' is included in the prelude starting in Edition 2021
@@ -32,12 +32,7 @@ error[E0433]: failed to resolve: use of undeclared type `FromIterator`
   --> $DIR/suggest-tryinto-edition-change.rs:23:22
    |
 LL |     let _v: Vec<_> = FromIterator::from_iter(&[1]);
-   |                      ^^^^^^^^^^^^
-   |
-  ::: $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL | pub trait IntoIterator {
-   | ---------------------- similarly named trait `IntoIterator` defined here
+   |                      ^^^^^^^^^^^^ use of undeclared type `FromIterator`
    |
    = note: 'std::iter::FromIterator' is included in the prelude starting in Edition 2021
    = note: 'core::iter::FromIterator' is included in the prelude starting in Edition 2021

Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `IntoIter`
`2`	`2`	`--> $DIR/issue-82956.rs:25:24`
`3`	`3`	`\|`
`4`	`4`	`LL \| let mut iter = IntoIter::new(self);`
`5`		`- \| ^^^^^^^^ not found in this scope`
	`5`	+ \| ^^^^^^^^ use of undeclared type `IntoIter`
`6`	`6`	`\|`
`7`	`7`	`help: consider importing one of these items`
`8`	`8`	`\|`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `HashMap`
`2`	`2`	`--> $DIR/issue-31997-1.rs:20:19`
`3`	`3`	`\|`
`4`	`4`	`LL \| let mut map = HashMap::new();`
`5`		`- \| ^^^^^^^ not found in this scope`
	`5`	+ \| ^^^^^^^ use of undeclared type `HashMap`
`6`	`6`	`\|`
`7`	`7`	`help: consider importing this struct`
`8`	`8`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| fn f() { ::bar::m!(); }`
`5`	`5`	`\| ----------- in this macro invocation`
`6`	`6`	`...`
`7`	`7`	`LL \| Vec::new();`
`8`		`- \| ^^^ not found in this scope`
	`8`	+ \| ^^^ use of undeclared type `Vec`
`9`	`9`	`\|`
`10`	`10`	= note: this error originates in the macro `::bar::m` (in Nightly builds, run with -Z macro-backtrace for more info)
`11`	`11`	`help: consider importing this struct`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `Command`
`2`	`2`	`--> $DIR/amputate-span.rs:49:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| Command::new("git");`
`5`		`- \| ^^^^^^^ not found in this scope`
	`5`	+ \| ^^^^^^^ use of undeclared type `Command`
`6`	`6`	`\|`
`7`	`7`	`help: consider importing this struct`
`8`	`8`	`\|`
@@ -13,7 +13,7 @@ error[E0433]: failed to resolve: use of undeclared type `Command`
`13`	`13`	`--> $DIR/amputate-span.rs:63:9`
`14`	`14`	`\|`
`15`	`15`	`LL \| Command::new("git");`
`16`		`- \| ^^^^^^^ not found in this scope`
	`16`	+ \| ^^^^^^^ use of undeclared type `Command`
`17`	`17`	`\|`
`18`	`18`	`help: consider importing this struct`
`19`	`19`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	error[E0433]: failed to resolve: could not find `hahmap` in `std`
`2`		`- --> $DIR/missing-in-namespace.rs:2:29`
	`2`	`+ --> $DIR/missing-in-namespace.rs:2:21`
`3`	`3`	`\|`
`4`	`4`	`LL \| let _map = std::hahmap::HashMap::new();`
`5`		- \| ^^^^^^^ not found in `std::hahmap`
	`5`	+ \| ^^^^^^ could not find `hahmap` in `std`
`6`	`6`	`\|`
`7`	`7`	`help: consider importing this struct`
`8`	`8`	`\|`
Original file line number	Diff line number	Diff line change
@@ -8,7 +8,7 @@ error[E0433]: failed to resolve: use of undeclared type `HashMap`
`8`	`8`	`--> $DIR/use_suggestion.rs:2:14`
`9`	`9`	`\|`
`10`	`10`	`LL \| let x1 = HashMap::new();`
`11`		`- \| ^^^^^^^ not found in this scope`
	`11`	+ \| ^^^^^^^ use of undeclared type `HashMap`
`12`	`12`	`\|`
`13`	`13`	`help: consider importing this struct`
`14`	`14`	`\|`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `NonZeroU32`
`2`	`2`	`--> $DIR/core-std-import-order-issue-83564.rs:8:14`
`3`	`3`	`\|`
`4`	`4`	`LL \| let _x = NonZeroU32::new(5).unwrap();`
`5`		`- \| ^^^^^^^^^^ not found in this scope`
	`5`	+ \| ^^^^^^^^^^ use of undeclared type `NonZeroU32`
`6`	`6`	`\|`
`7`	`7`	`help: consider importing one of these items`
`8`	`8`	`\|`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `TryFrom`
`2`	`2`	`--> $DIR/suggest-tryinto-edition-change.rs:11:19`
`3`	`3`	`\|`
`4`	`4`	`LL \| let _i: i16 = TryFrom::try_from(0_i32).unwrap();`
`5`		`- \| ^^^^^^^ not found in this scope`
	`5`	+ \| ^^^^^^^ use of undeclared type `TryFrom`
`6`	`6`	`\|`
`7`	`7`	`= note: 'std::convert::TryFrom' is included in the prelude starting in Edition 2021`
`8`	`8`	`= note: 'core::convert::TryFrom' is included in the prelude starting in Edition 2021`
@@ -17,7 +17,7 @@ error[E0433]: failed to resolve: use of undeclared type `TryInto`
`17`	`17`	`--> $DIR/suggest-tryinto-edition-change.rs:17:19`
`18`	`18`	`\|`
`19`	`19`	`LL \| let _i: i16 = TryInto::try_into(0_i32).unwrap();`
`20`		`- \| ^^^^^^^ not found in this scope`
	`20`	+ \| ^^^^^^^ use of undeclared type `TryInto`
`21`	`21`	`\|`
`22`	`22`	`= note: 'std::convert::TryInto' is included in the prelude starting in Edition 2021`
`23`	`23`	`= note: 'core::convert::TryInto' is included in the prelude starting in Edition 2021`
@@ -32,12 +32,7 @@ error[E0433]: failed to resolve: use of undeclared type `FromIterator`
`32`	`32`	`--> $DIR/suggest-tryinto-edition-change.rs:23:22`
`33`	`33`	`\|`
`34`	`34`	`LL \| let _v: Vec<_> = FromIterator::from_iter(&[1]);`
`35`		`- \| ^^^^^^^^^^^^`
`36`		`- \|`
`37`		`- ::: $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL`
`38`		`- \|`
`39`		`-LL \| pub trait IntoIterator {`
`40`		- \| ---------------------- similarly named trait `IntoIterator` defined here
	`35`	+ \| ^^^^^^^^^^^^ use of undeclared type `FromIterator`
`41`	`36`	`\|`
`42`	`37`	`= note: 'std::iter::FromIterator' is included in the prelude starting in Edition 2021`
`43`	`38`	`= note: 'core::iter::FromIterator' is included in the prelude starting in Edition 2021`