Updated the error messages for TestAbiEqNonsense in both debug.generic.stderr and debug.rs.

Author: YingkaiLi-VM

tests/ui/abi/debug.generic.stderr

@@ -89,7 +89,7 @@ error: fn_abi_of(test) = FnAbi {
            conv: Rust,
            can_unwind: $SOME_BOOL,
        }
-  --> $DIR/debug.rs:19:1
+  --> $DIR/debug.rs:23:1
    |
 LL | fn test(_x: u8) -> bool { true }
    | ^^^^^^^^^^^^^^^^^^^^^^^
@@ -185,7 +185,7 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
            conv: Rust,
            can_unwind: $SOME_BOOL,
        }
-  --> $DIR/debug.rs:22:1
+  --> $DIR/debug.rs:26:1
    |
 LL | type TestFnPtr = fn(bool) -> u8;
    | ^^^^^^^^^^^^^^
@@ -263,13 +263,13 @@ error: fn_abi_of(test_generic) = FnAbi {
            conv: Rust,
            can_unwind: $SOME_BOOL,
        }
-  --> $DIR/debug.rs:25:1
+  --> $DIR/debug.rs:29:1
    |
 LL | fn test_generic<T>(_x: *const T) { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: `#[rustc_abi]` can only be applied to function items, type aliases, and associated functions
-  --> $DIR/debug.rs:28:1
+  --> $DIR/debug.rs:32:1
    |
 LL | const C: () = ();
    | ^^^^^^^^^^^
@@ -419,7 +419,7 @@ error: ABIs are not compatible
            conv: Rust,
            can_unwind: $SOME_BOOL,
        }
-  --> $DIR/debug.rs:44:1
+  --> $DIR/debug.rs:48:1
    |
 LL | type TestAbiNe = (fn(u8), fn(u32));
    | ^^^^^^^^^^^^^^
@@ -571,7 +571,7 @@ error: ABIs are not compatible
            conv: Rust,
            can_unwind: $SOME_BOOL,
        }
-  --> $DIR/debug.rs:47:1
+  --> $DIR/debug.rs:51:1
    |
 LL | type TestAbiNeLarger = (fn([u8; 32]), fn([u32; 32]));
    | ^^^^^^^^^^^^^^^^^^^^
@@ -720,7 +720,7 @@ error: ABIs are not compatible
            conv: Rust,
            can_unwind: $SOME_BOOL,
        }
-  --> $DIR/debug.rs:50:1
+  --> $DIR/debug.rs:54:1
    |
 LL | type TestAbiNeFloat = (fn(f32), fn(u32));
    | ^^^^^^^^^^^^^^^^^^^
@@ -870,28 +870,27 @@ error: ABIs are not compatible
            conv: Rust,
            can_unwind: $SOME_BOOL,
        }
-  --> $DIR/debug.rs:54:1
+  --> $DIR/debug.rs:58:1
    |
 LL | type TestAbiNeSign = (fn(i32), fn(u32));
    | ^^^^^^^^^^^^^^^^^^
 
-error[E0277]: the size for values of type `str` cannot be known at compilation time
-  --> $DIR/debug.rs:57:46
+error[E0277]: the trait bound `str: Sized` is not satisfied
+  --> $DIR/debug.rs:61:46
    |
 LL | type TestAbiEqNonsense = (fn((str, str)), fn((str, str)));
-   |                                              ^^^^^^^^^^ doesn't have a size known at compile-time
+   |                                              ^^^^^^^^^^ the trait `Sized` is not implemented for `str`
    |
-   = help: the trait `Sized` is not implemented for `str`
    = note: only the last element of a tuple may have a dynamically sized type
 
 error: unrecognized argument
-  --> $DIR/debug.rs:59:13
+  --> $DIR/debug.rs:63:13
    |
 LL | #[rustc_abi("assert_eq")]
    |             ^^^^^^^^^^^
 
 error: `#[rustc_abi]` can only be applied to function items, type aliases, and associated functions
-  --> $DIR/debug.rs:32:5
+  --> $DIR/debug.rs:36:5
    |
 LL |     const C: () = ();
    |     ^^^^^^^^^^^
@@ -981,7 +980,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
            conv: Rust,
            can_unwind: $SOME_BOOL,
        }
-  --> $DIR/debug.rs:37:5
+  --> $DIR/debug.rs:41:5
    |
 LL |     fn assoc_test(&self) { }
    |     ^^^^^^^^^^^^^^^^^^^^

tests/ui/abi/debug.rs

@@ -6,13 +6,17 @@
 // This pattern is prepared for when we account for alignment in the niche.
 //@ normalize-stderr: "(valid_range): [1-9]\.\.=(429496729[0-9]|1844674407370955161[0-9])" -> "$1: $$NON_NULL"
 // Some attributes are only computed for release builds:
+//@ add-core-stubs
 //@ compile-flags: -O
 //@ revisions: generic riscv64
 //@ [riscv64] only-riscv64
 //@ [generic] ignore-riscv64
-#![feature(rustc_attrs)]
+
+#![feature(rustc_attrs,no_core)]
+#![no_core]
 #![crate_type = "lib"]
 
+extern crate minicore;
 struct S(u16);
 
 #[rustc_abi(debug)]
@@ -54,7 +58,7 @@ type TestAbiNeFloat = (fn(f32), fn(u32)); //~ ERROR: ABIs are not compatible
 type TestAbiNeSign = (fn(i32), fn(u32)); //~ ERROR: ABIs are not compatible
 
 #[rustc_abi(assert_eq)]
-type TestAbiEqNonsense = (fn((str, str)), fn((str, str))); //~ ERROR: cannot be known at compilation time
+type TestAbiEqNonsense = (fn((str, str)), fn((str, str))); //~ ERROR: the trait bound `str: Sized` is not satisfied [E0277]
 
 #[rustc_abi("assert_eq")] //~ ERROR unrecognized argument
 type Bad = u32;