broken tests after rebase?

Author: jdonszelmann

compiler/rustc_builtin_macros/src/eii.rs

@@ -204,7 +204,7 @@ fn eii_(
         id: ast::DUMMY_NODE_ID,
         span,
         vis: ast::Visibility { span, kind: ast::VisibilityKind::Inherited, tokens: None },
-        ident: Ident::dummy(),
+        ident: Ident::empty(),
         kind: ast::ItemKind::ForeignMod(ast::ForeignMod {
             extern_span: span,
             safety: ast::Safety::Unsafe(span),

tests/ui/eii/auxiliary/codegen3.rs

@@ -6,11 +6,11 @@
 #[eii(eii1)]
 fn decl1(x: u64);
 
-#[eii(eii2)] //~ ERROR couldn't find an implementation for `#[eii2]`
+#[eii(eii2)]
 pub fn decl2(x: u64);
 
 mod private {
-    #[eii(eii3)] //~ ERROR couldn't find an implementation for `#[eii3]`
+    #[eii(eii3)]
     pub fn decl3(x: u64);
 }
 

tests/ui/eii/duplicate/auxiliary/impl1.rs

@@ -6,7 +6,7 @@
 extern crate decl;
 
 
-#[unsafe(decl::eii1)] //~ ERROR multiple implementations of `#[eii1]`
+#[unsafe(decl::eii1)]
 fn other(x: u64) {
     println!("1{x}");
 }

tests/ui/eii/duplicate/duplicate1.rs

@@ -3,6 +3,9 @@
 //@ aux-build: impl2.rs
 #![feature(eii)]
 
+// has a span but in the other crate
+//~? ERROR multiple implementations of `#[eii1]`
+
 extern crate impl1;
 extern crate impl2;
 

tests/ui/eii/duplicate/duplicate1.stderr

@@ -9,7 +9,7 @@ LL | fn other(x: u64) {
 LL | fn other(x: u64) {
    | ---------------- also implemented here in crate `impl2`
    |
-   = help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict.
+   = help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict
 
 error: aborting due to 1 previous error
 

tests/ui/eii/duplicate/duplicate2.rs

@@ -4,6 +4,9 @@
 //@ aux-build: impl3.rs
 #![feature(eii)]
 
+// has a span but in the other crate
+//~? ERROR multiple implementations of `#[eii1]`
+
 extern crate impl1;
 extern crate impl2;
 extern crate impl3;

tests/ui/eii/duplicate/duplicate2.stderr

@@ -10,7 +10,7 @@ LL | fn other(x: u64) {
    | ---------------- also implemented here in crate `impl2`
    |
    = note: in addition to these two, another implementation was found in crate `impl3`
-   = help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict.
+   = help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict
 
 error: aborting due to 1 previous error
 

tests/ui/eii/duplicate/duplicate3.rs

@@ -5,6 +5,9 @@
 //@ aux-build: impl4.rs
 #![feature(eii)]
 
+// has a span but in the other crate
+//~? ERROR multiple implementations of `#[eii1]`
+
 extern crate impl1;
 extern crate impl2;
 extern crate impl3;

tests/ui/eii/duplicate/duplicate3.stderr

@@ -10,7 +10,7 @@ LL | fn other(x: u64) {
    | ---------------- also implemented here in crate `impl2`
    |
    = note: in addition to these two, more implementations were also found in the following crates: `impl3`, `impl4`
-   = help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict.
+   = help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict
 
 error: aborting due to 1 previous error
 

tests/ui/eii/errors.stderr

@@ -22,7 +22,7 @@ error: `#[eii_macro_for(...)]` expects a list of one or two elements
 LL | #[eii_macro_for()]
    | ^^^^^^^^^^^^^^^^^^
 
-error: expected this argument to be "unsafe".
+error: expected this argument to be "unsafe"
   --> $DIR/errors.rs:15:22
    |
 LL | #[eii_macro_for(bar, hello)]

tests/ui/eii/privacy2.rs

@@ -3,6 +3,10 @@
 
 extern crate codegen3 as codegen;
 
+// has a span but in the other crate
+//~? ERROR couldn't find an implementation for `#[eii2]`
+//~? ERROR couldn't find an implementation for `#[eii3]`
+
 #[codegen::eii1]
 fn eii1_impl(x: u64) {
     println!("{x:?}")

tests/ui/eii/privacy2.stderr

@@ -1,11 +1,11 @@
 error[E0433]: failed to resolve: could not find `eii3` in `codegen`
-  --> $DIR/privacy2.rs:11:12
+  --> $DIR/privacy2.rs:15:12
    |
 LL | #[codegen::eii3]
    |            ^^^^ could not find `eii3` in `codegen`
 
 error[E0603]: function `decl1` is private
-  --> $DIR/privacy2.rs:21:14
+  --> $DIR/privacy2.rs:25:14
    |
 LL |     codegen::decl1(42);
    |              ^^^^^ private function
@@ -23,7 +23,6 @@ LL | #[eii(eii2)]
    | ^^^^^^^^^^^^ an implementation was expected by this declaration
    |
    = help: expected at least one implementation in crate `privacy2` or any of its dependencies
-   = note: this error originates in the attribute macro `eii` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: couldn't find an implementation for `#[eii3]`
   --> $DIR/auxiliary/codegen3.rs:13:5
@@ -32,7 +31,6 @@ LL |     #[eii(eii3)]
    |     ^^^^^^^^^^^^ an implementation was expected by this declaration
    |
    = help: expected at least one implementation in crate `privacy2` or any of its dependencies
-   = note: this error originates in the attribute macro `eii` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors