Alter/Bless lots of tests of last CI failure.

Author: LorrensP-2158466

tests/ui/crate-loading/invalid-rlib.rs

@@ -4,8 +4,15 @@
 //@ rustc-env:RUSTC_LOG=error
 //@ edition:2018
 #![no_std]
-use ::foo; //~ ERROR invalid metadata files for crate `foo`
+use ::foo;
+//~^ ERROR invalid metadata files for crate `foo`
 //~| NOTE failed to mmap file
-//~^^ ERROR invalid metadata files for crate `foo`
+//~| ERROR invalid metadata files for crate `foo`
 //~| NOTE failed to mmap file
+//~| ERROR invalid metadata files for crate `foo`
+//~| NOTE failed to mmap file
+//~| ERROR invalid metadata files for crate `foo`
+//~| NOTE failed to mmap file
+//~| NOTE duplicate diagnostic
+//~| NOTE duplicate diagnostic
 //~| NOTE duplicate diagnostic

tests/ui/crate-loading/invalid-rlib.stderr

@@ -15,6 +15,24 @@ LL | use ::foo;
    = note: failed to mmap file 'auxiliary/libfoo.rlib'
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
-error: aborting due to 2 previous errors
+error[E0786]: found invalid metadata files for crate `foo`
+  --> $DIR/invalid-rlib.rs:7:7
+   |
+LL | use ::foo;
+   |       ^^^
+   |
+   = note: failed to mmap file 'auxiliary/libfoo.rlib'
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+
+error[E0786]: found invalid metadata files for crate `foo`
+  --> $DIR/invalid-rlib.rs:7:7
+   |
+LL | use ::foo;
+   |       ^^^
+   |
+   = note: failed to mmap file 'auxiliary/libfoo.rlib'
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+
+error: aborting due to 4 previous errors
 
 For more information about this error, try `rustc --explain E0786`.

tests/ui/error-codes/E0365.rs

@@ -4,5 +4,6 @@ mod foo {
 
 pub use foo as foo2;
 //~^ ERROR `foo` is only public within the crate, and cannot be re-exported outside [E0365]
+//~| ERROR `foo` is only public within the crate, and cannot be re-exported outside [E0365]
 
 fn main() {}

tests/ui/error-codes/E0365.stderr

@@ -6,6 +6,15 @@ LL | pub use foo as foo2;
    |
    = note: consider declaring type or module `foo` with `pub`
 
-error: aborting due to 1 previous error
+error[E0365]: `foo` is only public within the crate, and cannot be re-exported outside
+  --> $DIR/E0365.rs:5:9
+   |
+LL | pub use foo as foo2;
+   |         ^^^^^^^^^^^ re-export of crate public `foo`
+   |
+   = note: consider declaring type or module `foo` with `pub`
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0365`.

tests/ui/hygiene/privacy-early.rs

@@ -7,7 +7,9 @@ mod foo {
     macro f() {}
 
     pub macro m() {
-        use f as g; //~ ERROR `f` is private, and cannot be re-exported
+        use f as g;
+        //~^ ERROR `f` is private, and cannot be re-exported
+        //~| ERROR `f` is private, and cannot be re-exported
         f!();
     }
 }

tests/ui/hygiene/privacy-early.stderr

@@ -17,6 +17,26 @@ LL |     foo::m!();
    |     --------- in this macro invocation
    = note: this error originates in the macro `foo::m` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 1 previous error
+error[E0364]: `f` is private, and cannot be re-exported
+  --> $DIR/privacy-early.rs:10:13
+   |
+LL |         use f as g;
+   |             ^^^^^^
+...
+LL |     foo::m!();
+   |     --------- in this macro invocation
+   |
+note: consider marking `f` as `pub` in the imported module
+  --> $DIR/privacy-early.rs:10:13
+   |
+LL |         use f as g;
+   |             ^^^^^^
+...
+LL |     foo::m!();
+   |     --------- in this macro invocation
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+   = note: this error originates in the macro `foo::m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0364`.

tests/ui/imports/issue-109148.rs

@@ -10,7 +10,11 @@ macro_rules! m {
 
 m!();
 
-use std::mem; //~ ERROR `std` is ambiguous [E0659]
-use ::std::mem as _; //~ ERROR `std` is ambiguous [E0659]
+use std::mem;
+//~^ ERROR `std` is ambiguous [E0659]
+//~| ERROR `std` is ambiguous [E0659]
+use ::std::mem as _;
+//~^ ERROR `std` is ambiguous [E0659]
+//~| ERROR `std` is ambiguous [E0659]
 
 fn main() {}

tests/ui/imports/issue-109148.stderr

@@ -29,7 +29,7 @@ LL | m!();
    = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `std` is ambiguous
-  --> $DIR/issue-109148.rs:14:7
+  --> $DIR/issue-109148.rs:16:7
    |
 LL | use ::std::mem as _;
    |       ^^^ ambiguous name
@@ -67,7 +67,7 @@ LL | m!();
    = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `std` is ambiguous
-  --> $DIR/issue-109148.rs:14:7
+  --> $DIR/issue-109148.rs:16:7
    |
 LL | use ::std::mem as _;
    |       ^^^ ambiguous name

tests/ui/imports/issue-56125.rs

@@ -5,17 +5,21 @@
 mod m1 {
     use issue_56125::last_segment::*;
     //~^ ERROR `issue_56125` is ambiguous [E0659]
+    //~| ERROR `issue_56125` is ambiguous [E0659]
 }
 
 mod m2 {
     use issue_56125::non_last_segment::non_last_segment::*;
     //~^ ERROR `issue_56125` is ambiguous [E0659]
+    //~| ERROR `issue_56125` is ambiguous [E0659]
 }
 
 mod m3 {
     mod empty {}
     use empty::issue_56125; //~ ERROR unresolved import `empty::issue_56125`
-    use issue_56125::*; //~ ERROR `issue_56125` is ambiguous [E0659]
+    use issue_56125::*;
+    //~^ ERROR `issue_56125` is ambiguous [E0659]
+    //~| ERROR `issue_56125` is ambiguous [E0659]
 }
 
 fn main() {}

tests/ui/imports/issue-56125.stderr

@@ -1,5 +1,5 @@
 error[E0432]: unresolved import `empty::issue_56125`
-  --> $DIR/issue-56125.rs:17:9
+  --> $DIR/issue-56125.rs:19:9
    |
 LL |     use empty::issue_56125;
    |         ^^^^^^^^^^^^^^^^^^ no `issue_56125` in `m3::empty`
@@ -38,7 +38,7 @@ LL |     use issue_56125::last_segment::*;
    = help: or use `self::issue_56125` to refer to this module unambiguously
 
 error[E0659]: `issue_56125` is ambiguous
-  --> $DIR/issue-56125.rs:11:9
+  --> $DIR/issue-56125.rs:12:9
    |
 LL |     use issue_56125::non_last_segment::non_last_segment::*;
    |         ^^^^^^^^^^^ ambiguous name
@@ -47,7 +47,7 @@ LL |     use issue_56125::non_last_segment::non_last_segment::*;
    = note: `issue_56125` could refer to a crate passed with `--extern`
    = help: use `::issue_56125` to refer to this crate unambiguously
 note: `issue_56125` could also refer to the module imported here
-  --> $DIR/issue-56125.rs:11:9
+  --> $DIR/issue-56125.rs:12:9
    |
 LL |     use issue_56125::non_last_segment::non_last_segment::*;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -73,7 +73,7 @@ LL |     use issue_56125::last_segment::*;
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
 error[E0659]: `issue_56125` is ambiguous
-  --> $DIR/issue-56125.rs:11:9
+  --> $DIR/issue-56125.rs:12:9
    |
 LL |     use issue_56125::non_last_segment::non_last_segment::*;
    |         ^^^^^^^^^^^ ambiguous name
@@ -82,7 +82,7 @@ LL |     use issue_56125::non_last_segment::non_last_segment::*;
    = note: `issue_56125` could refer to a crate passed with `--extern`
    = help: use `::issue_56125` to refer to this crate unambiguously
 note: `issue_56125` could also refer to the module imported here
-  --> $DIR/issue-56125.rs:11:9
+  --> $DIR/issue-56125.rs:12:9
    |
 LL |     use issue_56125::non_last_segment::non_last_segment::*;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -91,7 +91,7 @@ LL |     use issue_56125::non_last_segment::non_last_segment::*;
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
 error[E0659]: `issue_56125` is ambiguous
-  --> $DIR/issue-56125.rs:18:9
+  --> $DIR/issue-56125.rs:20:9
    |
 LL |     use issue_56125::*;
    |         ^^^^^^^^^^^ ambiguous name
@@ -100,15 +100,15 @@ LL |     use issue_56125::*;
    = note: `issue_56125` could refer to a crate passed with `--extern`
    = help: use `::issue_56125` to refer to this crate unambiguously
 note: `issue_56125` could also refer to the module imported here
-  --> $DIR/issue-56125.rs:18:9
+  --> $DIR/issue-56125.rs:20:9
    |
 LL |     use issue_56125::*;
    |         ^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `issue_56125` to disambiguate
    = help: or use `self::issue_56125` to refer to this module unambiguously
 
 error[E0659]: `issue_56125` is ambiguous
-  --> $DIR/issue-56125.rs:18:9
+  --> $DIR/issue-56125.rs:20:9
    |
 LL |     use issue_56125::*;
    |         ^^^^^^^^^^^ ambiguous name
@@ -117,7 +117,7 @@ LL |     use issue_56125::*;
    = note: `issue_56125` could refer to a crate passed with `--extern`
    = help: use `::issue_56125` to refer to this crate unambiguously
 note: `issue_56125` could also refer to the module imported here
-  --> $DIR/issue-56125.rs:18:9
+  --> $DIR/issue-56125.rs:20:9
    |
 LL |     use issue_56125::*;
    |         ^^^^^^^^^^^^^^