TEMP: fixes error codes in non-codegen tests. those work after the type checking

jdonszelmann · jdonszelmann · commit 23eec42c2fe6 · 2025-09-08T14:57:29.000-07:00
diff --git a/tests/ui/eii/auxiliary/cross_crate_eii_declaration.rs b/tests/ui/eii/auxiliary/cross_crate_eii_declaration.rs
@@ -5,11 +5,9 @@
 #![feature(rustc_attrs)]
 #![feature(eii_internals)]
 
-#[eii_macro_for(bar)]
+#[eii_extern_target(bar)]
 #[rustc_builtin_macro(eii_macro)]
-pub macro foo() {
-
-}
+pub macro foo() {}
 
 unsafe extern "Rust" {
     pub safe fn bar(x: u64) -> u64;
diff --git a/tests/ui/eii/cross_crate_wrong_ty.stderr b/tests/ui/eii/cross_crate_wrong_ty.stderr
@@ -1,16 +1,16 @@
-error[E0050]: `other` has 0 parameters but #[foo] requires it to have 1
+error[E0806]: `other` has 0 parameters but #[foo] requires it to have 1
   --> $DIR/cross_crate_wrong_ty.rs:11:1
    |
 LL | #[unsafe(cross_crate_eii_declaration::foo)]
    | ------------------------------------------- required because of this attribute
 LL | fn other() -> u64 {
    | ^^^^^^^^^^^^^^^^^ expected 1 parameter, found 0
    |
-  ::: $DIR/auxiliary/cross_crate_eii_declaration.rs:15:5
+  ::: $DIR/auxiliary/cross_crate_eii_declaration.rs:13:5
    |
 LL |     pub safe fn bar(x: u64) -> u64;
    |     ------------------------------- requires 1 parameter
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0050`.
+For more information about this error, try `rustc --explain E0806`.
diff --git a/tests/ui/eii/errors.rs b/tests/ui/eii/errors.rs
@@ -10,13 +10,13 @@ fn hello() {
     let x = 3 + 3;
 }
 
-#[eii_macro_for] //~ ERROR `#[eii_macro_for(...)]` expects a list of one or two elements
-#[eii_macro_for()] //~ ERROR `#[eii_macro_for(...)]` expects a list of one or two elements
-#[eii_macro_for(bar, hello)] //~ ERROR expected this argument to be "unsafe"
-#[eii_macro_for(bar, "unsafe", hello)] //~ ERROR `#[eii_macro_for(...)]` expects a list of one or two elements
-#[eii_macro_for(bar, hello, "unsafe")] //~ ERROR `#[eii_macro_for(...)]` expects a list of one or two elements
-#[eii_macro_for = "unsafe"] //~ ERROR `#[eii_macro_for(...)]` expects a list of one or two elements
-#[eii_macro_for(bar)]
+#[eii_extern_target] //~ ERROR `#[eii_extern_target(...)]` expects a list of one or two elements
+#[eii_extern_target()] //~ ERROR `#[eii_extern_target(...)]` expects a list of one or two elements
+#[eii_extern_target(bar, hello)] //~ ERROR expected this argument to be "unsafe"
+#[eii_extern_target(bar, "unsafe", hello)] //~ ERROR `#[eii_extern_target(...)]` expects a list of one or two elements
+#[eii_extern_target(bar, hello, "unsafe")] //~ ERROR `#[eii_extern_target(...)]` expects a list of one or two elements
+#[eii_extern_target = "unsafe"] //~ ERROR `#[eii_extern_target(...)]` expects a list of one or two elements
+#[eii_extern_target(bar)]
 #[rustc_builtin_macro(eii_macro)]
 macro foo() {}
 
diff --git a/tests/ui/eii/errors.stderr b/tests/ui/eii/errors.stderr
@@ -1,56 +1,56 @@
 error: `#[eii_macro_for(...)]` is only valid on macros
   --> $DIR/errors.rs:7:1
    |
-LL | #[eii_macro_for(bar)]
-   | ^^^^^^^^^^^^^^^^^^^^^
+LL | #[eii_extern_target(bar)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: `#[eii_macro_for(...)]` is only valid on macros
   --> $DIR/errors.rs:9:5
    |
-LL |     #[eii_macro_for(bar)]
-   |     ^^^^^^^^^^^^^^^^^^^^^
+LL |     #[eii_extern_target(bar)]
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: `#[eii_macro_for(...)]` expects a list of one or two elements
   --> $DIR/errors.rs:13:1
    |
-LL | #[eii_macro_for]
-   | ^^^^^^^^^^^^^^^^
+LL | #[eii_extern_target]
+   | ^^^^^^^^^^^^^^^^^^^^
 
 error: `#[eii_macro_for(...)]` expects a list of one or two elements
   --> $DIR/errors.rs:14:1
    |
-LL | #[eii_macro_for()]
-   | ^^^^^^^^^^^^^^^^^^
+LL | #[eii_extern_target()]
+   | ^^^^^^^^^^^^^^^^^^^^^^
 
 error: expected this argument to be "unsafe"
-  --> $DIR/errors.rs:15:22
+  --> $DIR/errors.rs:15:26
    |
-LL | #[eii_macro_for(bar, hello)]
-   |                      ^^^^^
+LL | #[eii_extern_target(bar, hello)]
+   |                          ^^^^^
    |
 note: the second argument is optional
-  --> $DIR/errors.rs:15:22
+  --> $DIR/errors.rs:15:26
    |
-LL | #[eii_macro_for(bar, hello)]
-   |                      ^^^^^
+LL | #[eii_extern_target(bar, hello)]
+   |                          ^^^^^
 
 error: `#[eii_macro_for(...)]` expects a list of one or two elements
   --> $DIR/errors.rs:16:1
    |
-LL | #[eii_macro_for(bar, "unsafe", hello)]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | #[eii_extern_target(bar, "unsafe", hello)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: `#[eii_macro_for(...)]` expects a list of one or two elements
   --> $DIR/errors.rs:17:1
    |
-LL | #[eii_macro_for(bar, hello, "unsafe")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | #[eii_extern_target(bar, hello, "unsafe")]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: `#[eii_macro_for(...)]` expects a list of one or two elements
   --> $DIR/errors.rs:18:1
    |
-LL | #[eii_macro_for = "unsafe"]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | #[eii_extern_target = "unsafe"]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: `#[foo]` is only valid on functions
   --> $DIR/errors.rs:27:1
diff --git a/tests/ui/eii/subtype_1.stderr b/tests/ui/eii/subtype_1.stderr
@@ -1,5 +1,5 @@
 error: lifetime parameters or bounds of `other` do not match the declaration
-  --> $DIR/subtype_1.rs:18:9
+  --> $DIR/subtype_1.rs:16:9
    |
 LL |     safe fn bar<'a, 'b>(x: &'b u64) -> &'a u64;
    |                -------- lifetimes in impl do not match this signature
diff --git a/tests/ui/eii/subtype_2.stderr b/tests/ui/eii/subtype_2.stderr
@@ -1,5 +1,5 @@
 error: lifetime parameters or bounds of `other` do not match the declaration
-  --> $DIR/subtype_2.rs:18:9
+  --> $DIR/subtype_2.rs:16:9
    |
 LL |     safe fn bar<'a>(x: &'static u64) -> &'a u64;
    |                ---- lifetimes in impl do not match this signature
diff --git a/tests/ui/eii/unsafe_impl_err.stderr b/tests/ui/eii/unsafe_impl_err.stderr
@@ -1,5 +1,5 @@
 error: `#[foo]` is unsafe to implement
-  --> $DIR/unsafe_impl_err.rs:17:1
+  --> $DIR/unsafe_impl_err.rs:15:1
    |
 LL | #[foo]
    | ^^^^^^
diff --git a/tests/ui/eii/wrong_ret_ty.stderr b/tests/ui/eii/wrong_ret_ty.stderr
@@ -1,16 +1,16 @@
-error[E0053]: function `other` has a type that is incompatible with the declaration of `#[foo]`
-  --> $DIR/wrong_ret_ty.rs:18:18
+error[E0806]: function `other` has a type that is incompatible with the declaration of `#[foo]`
+  --> $DIR/wrong_ret_ty.rs:16:18
    |
 LL | fn other(_x: u64) {
    |                  ^ expected `u64`, found `()`
    |
 note: expected this because of this attribute
-  --> $DIR/wrong_ret_ty.rs:17:1
+  --> $DIR/wrong_ret_ty.rs:15:1
    |
 LL | #[foo]
    | ^^^^^^
 note: type in declaration
-  --> $DIR/wrong_ret_ty.rs:14:28
+  --> $DIR/wrong_ret_ty.rs:12:28
    |
 LL |     safe fn bar(x: u64) -> u64;
    |                            ^^^
@@ -23,4 +23,4 @@ LL | fn other(_x: u64) -> u64 {
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0053`.
+For more information about this error, try `rustc --explain E0806`.
diff --git a/tests/ui/eii/wrong_ty.stderr b/tests/ui/eii/wrong_ty.stderr
@@ -1,16 +1,16 @@
-error[E0053]: function `other` has a type that is incompatible with the declaration of `#[foo]`
-  --> $DIR/wrong_ty.rs:18:13
+error[E0806]: function `other` has a type that is incompatible with the declaration of `#[foo]`
+  --> $DIR/wrong_ty.rs:16:13
    |
 LL | fn other(x: usize) -> u64 {
    |             ^^^^^ expected `u64`, found `usize`
    |
 note: expected this because of this attribute
-  --> $DIR/wrong_ty.rs:17:1
+  --> $DIR/wrong_ty.rs:15:1
    |
 LL | #[foo]
    | ^^^^^^
 note: type in declaration
-  --> $DIR/wrong_ty.rs:14:20
+  --> $DIR/wrong_ty.rs:12:20
    |
 LL |     safe fn bar(x: u64) -> u64;
    |                    ^^^
@@ -24,4 +24,4 @@ LL + fn other(x: u64) -> u64 {
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0053`.
+For more information about this error, try `rustc --explain E0806`.
diff --git a/tests/ui/eii/wrong_ty_2.stderr b/tests/ui/eii/wrong_ty_2.stderr
@@ -1,5 +1,5 @@
-error[E0050]: `other` has 0 parameters but #[foo] requires it to have 1
-  --> $DIR/wrong_ty_2.rs:18:1
+error[E0806]: `other` has 0 parameters but #[foo] requires it to have 1
+  --> $DIR/wrong_ty_2.rs:16:1
    |
 LL |     safe fn bar(x: u64) -> u64;
    |                    --- requires 1 parameter
@@ -11,4 +11,4 @@ LL | fn other() -> u64 {
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0050`.
+For more information about this error, try `rustc --explain E0806`.

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`		-error[E0050]: `other` has 0 parameters but #[foo] requires it to have 1
	`1`	+error[E0806]: `other` has 0 parameters but #[foo] requires it to have 1
`2`	`2`	`--> $DIR/cross_crate_wrong_ty.rs:11:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[unsafe(cross_crate_eii_declaration::foo)]`
`5`	`5`	`\| ------------------------------------------- required because of this attribute`
`6`	`6`	`LL \| fn other() -> u64 {`
`7`	`7`	`\| ^^^^^^^^^^^^^^^^^ expected 1 parameter, found 0`
`8`	`8`	`\|`
`9`		`- ::: $DIR/auxiliary/cross_crate_eii_declaration.rs:15:5`
	`9`	`+ ::: $DIR/auxiliary/cross_crate_eii_declaration.rs:13:5`
`10`	`10`	`\|`
`11`	`11`	`LL \| pub safe fn bar(x: u64) -> u64;`
`12`	`12`	`\| ------------------------------- requires 1 parameter`
`13`	`13`
`14`	`14`	`error: aborting due to 1 previous error`
`15`	`15`
`16`		-For more information about this error, try `rustc --explain E0050`.
	`16`	+For more information about this error, try `rustc --explain E0806`.
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error: lifetime parameters or bounds of `other` do not match the declaration
`2`		`- --> $DIR/subtype_1.rs:18:9`
	`2`	`+ --> $DIR/subtype_1.rs:16:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| safe fn bar<'a, 'b>(x: &'b u64) -> &'a u64;`
`5`	`5`	`\| -------- lifetimes in impl do not match this signature`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error: lifetime parameters or bounds of `other` do not match the declaration
`2`		`- --> $DIR/subtype_2.rs:18:9`
	`2`	`+ --> $DIR/subtype_2.rs:16:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| safe fn bar<'a>(x: &'static u64) -> &'a u64;`
`5`	`5`	`\| ---- lifetimes in impl do not match this signature`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error: `#[foo]` is unsafe to implement
`2`		`- --> $DIR/unsafe_impl_err.rs:17:1`
	`2`	`+ --> $DIR/unsafe_impl_err.rs:15:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[foo]`
`5`	`5`	`\| ^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`		-error[E0053]: function `other` has a type that is incompatible with the declaration of `#[foo]`
`2`		`- --> $DIR/wrong_ret_ty.rs:18:18`
	`1`	+error[E0806]: function `other` has a type that is incompatible with the declaration of `#[foo]`
	`2`	`+ --> $DIR/wrong_ret_ty.rs:16:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn other(_x: u64) {`
`5`	`5`	\| ^ expected `u64`, found `()`
`6`	`6`	`\|`
`7`	`7`	`note: expected this because of this attribute`
`8`		`- --> $DIR/wrong_ret_ty.rs:17:1`
	`8`	`+ --> $DIR/wrong_ret_ty.rs:15:1`
`9`	`9`	`\|`
`10`	`10`	`LL \| #[foo]`
`11`	`11`	`\| ^^^^^^`
`12`	`12`	`note: type in declaration`
`13`		`- --> $DIR/wrong_ret_ty.rs:14:28`
	`13`	`+ --> $DIR/wrong_ret_ty.rs:12:28`
`14`	`14`	`\|`
`15`	`15`	`LL \| safe fn bar(x: u64) -> u64;`
`16`	`16`	`\| ^^^`
`@@ -23,4 +23,4 @@ LL \| fn other(_x: u64) -> u64 {`
`23`	`23`
`24`	`24`	`error: aborting due to 1 previous error`
`25`	`25`
`26`		-For more information about this error, try `rustc --explain E0053`.
	`26`	+For more information about this error, try `rustc --explain E0806`.
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`		-error[E0053]: function `other` has a type that is incompatible with the declaration of `#[foo]`
`2`		`- --> $DIR/wrong_ty.rs:18:13`
	`1`	+error[E0806]: function `other` has a type that is incompatible with the declaration of `#[foo]`
	`2`	`+ --> $DIR/wrong_ty.rs:16:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn other(x: usize) -> u64 {`
`5`	`5`	\| ^^^^^ expected `u64`, found `usize`
`6`	`6`	`\|`
`7`	`7`	`note: expected this because of this attribute`
`8`		`- --> $DIR/wrong_ty.rs:17:1`
	`8`	`+ --> $DIR/wrong_ty.rs:15:1`
`9`	`9`	`\|`
`10`	`10`	`LL \| #[foo]`
`11`	`11`	`\| ^^^^^^`
`12`	`12`	`note: type in declaration`
`13`		`- --> $DIR/wrong_ty.rs:14:20`
	`13`	`+ --> $DIR/wrong_ty.rs:12:20`
`14`	`14`	`\|`
`15`	`15`	`LL \| safe fn bar(x: u64) -> u64;`
`16`	`16`	`\| ^^^`
`@@ -24,4 +24,4 @@ LL + fn other(x: u64) -> u64 {`
`24`	`24`
`25`	`25`	`error: aborting due to 1 previous error`
`26`	`26`
`27`		-For more information about this error, try `rustc --explain E0053`.
	`27`	+For more information about this error, try `rustc --explain E0806`.