rust-lang · rust-bors · Jan 11, 2026 · Jan 10, 2026
diff --git a/tests/ui/eii/auxiliary/codegen1.rs → .../ui/eii/auxiliary/other_crate_privacy1.rs b/tests/ui/eii/auxiliary/codegen1.rs → .../ui/eii/auxiliary/other_crate_privacy1.rs
diff --git a/tests/ui/eii/auxiliary/codegen3.rs → .../ui/eii/auxiliary/other_crate_privacy2.rs b/tests/ui/eii/auxiliary/codegen3.rs → .../ui/eii/auxiliary/other_crate_privacy2.rs
diff --git a/tests/ui/eii/multiple_decls.rs → tests/ui/eii/duplicate/multiple_decls.rs b/tests/ui/eii/multiple_decls.rs → tests/ui/eii/duplicate/multiple_decls.rs
diff --git a/tests/ui/eii/multiple_decls.stderr → tests/ui/eii/duplicate/multiple_decls.stderr b/tests/ui/eii/multiple_decls.stderr → tests/ui/eii/duplicate/multiple_decls.stderr
diff --git a/tests/ui/eii/multiple_impls.rs → tests/ui/eii/duplicate/multiple_impls.rs b/tests/ui/eii/multiple_impls.rs → tests/ui/eii/duplicate/multiple_impls.rs
diff --git a/tests/ui/eii/multiple_impls.run.stdout → ...i/eii/duplicate/multiple_impls.run.stdout b/tests/ui/eii/multiple_impls.run.stdout → ...i/eii/duplicate/multiple_impls.run.stdout
diff --git a/tests/ui/eii/auxiliary/codegen2.rs → ...iliary/codegen_cross_crate_other_crate.rs b/tests/ui/eii/auxiliary/codegen2.rs → ...iliary/codegen_cross_crate_other_crate.rs
diff --git a/tests/ui/eii/codegen_cross_crate.rs → tests/ui/eii/linking/codegen_cross_crate.rs b/tests/ui/eii/codegen_cross_crate.rs → tests/ui/eii/linking/codegen_cross_crate.rs
@@ -1,14 +1,14 @@
 //@ run-pass
 //@ check-run-results
-//@ aux-build: codegen2.rs
+//@ aux-build: codegen_cross_crate_other_crate.rs
 //@ compile-flags: -O
 //@ ignore-backends: gcc
 // FIXME: linking on windows (speciifcally mingw) not yet supported, see tracking issue #125418
 //@ ignore-windows
 // Tests whether calling EIIs works with the declaration in another crate.
 #![feature(extern_item_impls)]
 
-extern crate codegen2 as codegen;
+extern crate codegen_cross_crate_other_crate as codegen;
 
 #[codegen::eii1]
 fn eii1_impl(x: u64) {

diff --git a/tests/ui/eii/codegen_cross_crate.run.stdout → ...ii/linking/codegen_cross_crate.run.stdout b/tests/ui/eii/codegen_cross_crate.run.stdout → ...ii/linking/codegen_cross_crate.run.stdout
diff --git a/tests/ui/eii/codegen_single_crate.rs → tests/ui/eii/linking/codegen_single_crate.rs b/tests/ui/eii/codegen_single_crate.rs → tests/ui/eii/linking/codegen_single_crate.rs
diff --git a/tests/ui/eii/codegen_single_crate.run.stdout → ...i/linking/codegen_single_crate.run.stdout b/tests/ui/eii/codegen_single_crate.run.stdout → ...i/linking/codegen_single_crate.run.stdout
diff --git a/tests/ui/eii/same-symbol.rs → tests/ui/eii/linking/same-symbol.rs b/tests/ui/eii/same-symbol.rs → tests/ui/eii/linking/same-symbol.rs
diff --git a/tests/ui/eii/same-symbol.run.stdout → tests/ui/eii/linking/same-symbol.run.stdout b/tests/ui/eii/same-symbol.run.stdout → tests/ui/eii/linking/same-symbol.run.stdout
diff --git a/tests/ui/eii/privacy1.rs b/tests/ui/eii/privacy1.rs
@@ -1,13 +1,13 @@
 //@ run-pass
 //@ check-run-results
-//@ aux-build: codegen1.rs
+//@ aux-build: other_crate_privacy1.rs
 //@ ignore-backends: gcc
-// FIXME: linking on windows (speciifcally mingw) not yet supported, see tracking issue #125418
+// FIXME: linking on windows (specifically mingw) not yet supported, see tracking issue #125418
 //@ ignore-windows
 // Tests whether re-exports work.
 #![feature(extern_item_impls)]
 
-extern crate codegen1 as codegen;
+extern crate other_crate_privacy1 as codegen;
 
 #[codegen::eii1]
 fn eii1_impl(x: u64) {

diff --git a/tests/ui/eii/privacy2.rs b/tests/ui/eii/privacy2.rs
@@ -1,8 +1,8 @@
-//@ aux-build:codegen3.rs
+//@ aux-build:other_crate_privacy2.rs
 // Tests whether name resolution respects privacy properly.
 #![feature(extern_item_impls)]
 
-extern crate codegen3 as codegen;
+extern crate other_crate_privacy2 as codegen;
 
 // has a span but in the other crate
 //~? ERROR `#[eii2]` required, but not found

diff --git a/tests/ui/eii/privacy2.stderr b/tests/ui/eii/privacy2.stderr
@@ -11,24 +11,24 @@ LL |     codegen::decl1(42);
    |              ^^^^^ private function
    |
 note: the function `decl1` is defined here
-  --> $DIR/auxiliary/codegen3.rs:7:1
+  --> $DIR/auxiliary/other_crate_privacy2.rs:7:1
    |
 LL | fn decl1(x: u64);
    | ^^^^^^^^^^^^^^^^^
 
 error: `#[eii2]` required, but not found
-  --> $DIR/auxiliary/codegen3.rs:9:7
+  --> $DIR/auxiliary/other_crate_privacy2.rs:9:7
    |
 LL | #[eii(eii2)]
-   |       ^^^^ expected because `#[eii2]` was declared here in crate `codegen3`
+   |       ^^^^ expected because `#[eii2]` was declared here in crate `other_crate_privacy2`
    |
    = help: expected at least one implementation in crate `privacy2` or any of its dependencies
 
 error: `#[eii3]` required, but not found
-  --> $DIR/auxiliary/codegen3.rs:13:11
+  --> $DIR/auxiliary/other_crate_privacy2.rs:13:11
    |
 LL |     #[eii(eii3)]
-   |           ^^^^ expected because `#[eii3]` was declared here in crate `codegen3`
+   |           ^^^^ expected because `#[eii3]` was declared here in crate `other_crate_privacy2`
    |
    = help: expected at least one implementation in crate `privacy2` or any of its dependencies
 

diff --git a/.../auxiliary/cross_crate_eii_declaration.rs → .../auxiliary/cross_crate_eii_declaration.rs b/.../auxiliary/cross_crate_eii_declaration.rs → .../auxiliary/cross_crate_eii_declaration.rs
diff --git a/tests/ui/eii/cross_crate.rs → .../eii/type_checking/cross_crate_type_ok.rs b/tests/ui/eii/cross_crate.rs → .../eii/type_checking/cross_crate_type_ok.rs
diff --git a/tests/ui/eii/cross_crate_wrong_ty.rs → ...eii/type_checking/cross_crate_wrong_ty.rs b/tests/ui/eii/cross_crate_wrong_ty.rs → ...eii/type_checking/cross_crate_wrong_ty.rs
diff --git a/tests/ui/eii/cross_crate_wrong_ty.stderr → ...type_checking/cross_crate_wrong_ty.stderr b/tests/ui/eii/cross_crate_wrong_ty.stderr → ...type_checking/cross_crate_wrong_ty.stderr