bless test for green CI

bless another test

Author: LorrensP-2158466

tests/ui/imports/ambiguous-2.rs

@@ -1,9 +1,10 @@
+//@ check-pass
 //@ aux-build: ../ambiguous-1.rs
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1633574396
 
 extern crate ambiguous_1;
 
 fn main() {
-    ambiguous_1::id(); //~ ERROR cannot find function `id` in crate `ambiguous_1`
+    ambiguous_1::id();
     //^ FIXME: `id` should be identified as an ambiguous item.
 }

tests/ui/imports/ambiguous-2.stderr

@@ -1,8 +1,9 @@
+//@ check-pass
 //@ aux-build: ../ambiguous-4-extern.rs
 
 extern crate ambiguous_4_extern;
 
 fn main() {
-    ambiguous_4_extern::id(); //~ ERROR cannot find function `id` in crate `ambiguous_4_extern`
+    ambiguous_4_extern::id();
     //^ FIXME: `id` should be identified as an ambiguous item.
 }

tests/ui/imports/ambiguous-4.rs

@@ -6,7 +6,7 @@ fn main() {
     glob_conflict::f(); //~ ERROR cannot find function `f` in crate `glob_conflict`
     //^ FIXME: `glob_conflict::f` should raise an
     // ambiguity error instead of a not found error.
-    glob_conflict::glob::f(); //~ ERROR cannot find function `f` in module `glob_conflict::glob`
+    glob_conflict::glob::f();
     //^ FIXME: `glob_conflict::glob::f` should raise an
     // ambiguity error instead of a not found error.
 }

tests/ui/imports/ambiguous-4.stderr

@@ -3,13 +3,17 @@ error[E0425]: cannot find function `f` in crate `glob_conflict`
    |
 LL |     glob_conflict::f();
    |                    ^ not found in `glob_conflict`
-
-error[E0425]: cannot find function `f` in module `glob_conflict::glob`
-  --> $DIR/glob-conflict-cross-crate-1.rs:9:26
    |
-LL |     glob_conflict::glob::f();
-   |                          ^ not found in `glob_conflict::glob`
+help: consider importing this function
+   |
+LL + use glob_conflict::glob::f;
+   |
+help: if you import `f`, refer to it directly
+   |
+LL -     glob_conflict::f();
+LL +     f();
+   |
 
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0425`.

tests/ui/imports/glob-conflict-cross-crate-1.rs

@@ -1,5 +1,5 @@
 error[E0603]: derive macro `Embed` is private
-  --> $DIR/same-res-ambigious.rs:8:28
+  --> $DIR/same-res-ambigious.rs:7:28
    |
 LL | #[derive(ambigious_extern::Embed)]
    |                            ^^^^^ private derive macro

tests/ui/imports/glob-conflict-cross-crate-1.stderr

@@ -0,0 +1,20 @@
+error[E0603]: derive macro `Embed` is private
+  --> $DIR/same-res-ambigious.rs:7:28
+   |
+LL | #[derive(ambigious_extern::Embed)]
+   |                            ^^^^^ private derive macro
+   |
+note: the derive macro `Embed` is defined here
+  --> $DIR/auxiliary/same-res-ambigious-extern.rs:11:9
+   |
+LL | pub use RustEmbed as Embed;
+   |         ^^^^^^^^^
+help: import `Embed` directly
+   |
+LL - #[derive(ambigious_extern::Embed)]
+LL + #[derive(same_res_ambigious_extern_macro::RustEmbed)]
+   |
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0603`.

tests/ui/imports/same-res-ambigious.fail.stderr

@@ -1,11 +1,10 @@
 //@ edition: 2018
 //@ revisions: fail pass
-//@[pass] check-pass
 //@[pass] aux-crate: ambigious_extern=same-res-ambigious-extern.rs
 //@[fail] aux-crate: ambigious_extern=same-res-ambigious-extern-fail.rs
 // see https://github.com/rust-lang/rust/pull/147196
 
-#[derive(ambigious_extern::Embed)] //[fail]~ ERROR: derive macro `Embed` is private
+#[derive(ambigious_extern::Embed)] //~ ERROR: derive macro `Embed` is private
 struct Foo{}
 
 fn main(){}