update more ui tests

Author: folkertdev

src/tools/miri/tests/pass/c-variadic-ignored-argument.rs

@@ -2,7 +2,6 @@
 //@ ignore-target: powerpc # does not ignore ZST arguments
 //@ ignore-target: s390x # does not ignore ZST arguments
 //@ ignore-target: sparc # does not ignore ZST arguments
-#![feature(c_variadic)]
 
 // Some platforms ignore ZSTs, meaning that the argument is not passed, even though it is part
 // of the callee's ABI. Test that this doesn't trip any asserts.

tests/ui/c-variadic/issue-86053-1.stderr

@@ -1,61 +1,61 @@
 error: expected type, found `,`
-  --> $DIR/issue-86053-1.rs:6:47
+  --> $DIR/issue-86053-1.rs:5:47
    |
 LL | fn ordering4 < 'a , 'b     > ( a :            ,   self , self ,   self ,
    |                                               ^ expected type
 
 error: unexpected `self` parameter in function
-  --> $DIR/issue-86053-1.rs:6:51
+  --> $DIR/issue-86053-1.rs:5:51
    |
 LL | fn ordering4 < 'a , 'b     > ( a :            ,   self , self ,   self ,
    |                                                   ^^^^ must be the first parameter of an associated function
 
 error: unexpected `self` parameter in function
-  --> $DIR/issue-86053-1.rs:6:58
+  --> $DIR/issue-86053-1.rs:5:58
    |
 LL | fn ordering4 < 'a , 'b     > ( a :            ,   self , self ,   self ,
    |                                                          ^^^^ must be the first parameter of an associated function
 
 error: unexpected `self` parameter in function
-  --> $DIR/issue-86053-1.rs:6:67
+  --> $DIR/issue-86053-1.rs:5:67
    |
 LL | fn ordering4 < 'a , 'b     > ( a :            ,   self , self ,   self ,
    |                                                                   ^^^^ must be the first parameter of an associated function
 
 error: unexpected `self` parameter in function
-  --> $DIR/issue-86053-1.rs:11:5
+  --> $DIR/issue-86053-1.rs:10:5
    |
 LL |     self , _: ... ,   self ,   self , _: ... ) where F : FnOnce ( & 'a & 'b usize ) {
    |     ^^^^ must be the first parameter of an associated function
 
 error: unexpected `self` parameter in function
-  --> $DIR/issue-86053-1.rs:11:23
+  --> $DIR/issue-86053-1.rs:10:23
    |
 LL |     self , _: ... ,   self ,   self , _: ... ) where F : FnOnce ( & 'a & 'b usize ) {
    |                       ^^^^ must be the first parameter of an associated function
 
 error: unexpected `self` parameter in function
-  --> $DIR/issue-86053-1.rs:11:32
+  --> $DIR/issue-86053-1.rs:10:32
    |
 LL |     self , _: ... ,   self ,   self , _: ... ) where F : FnOnce ( & 'a & 'b usize ) {
    |                                ^^^^ must be the first parameter of an associated function
 
 error: `...` must be the last argument of a C-variadic function
-  --> $DIR/issue-86053-1.rs:11:12
+  --> $DIR/issue-86053-1.rs:10:12
    |
 LL |     self , _: ... ,   self ,   self , _: ... ) where F : FnOnce ( & 'a & 'b usize ) {
    |            ^^^^^^
 
 error: `...` is not supported for non-extern functions
-  --> $DIR/issue-86053-1.rs:11:39
+  --> $DIR/issue-86053-1.rs:10:39
    |
 LL |     self , _: ... ,   self ,   self , _: ... ) where F : FnOnce ( & 'a & 'b usize ) {
    |                                       ^^^^^^
    |
    = help: only `extern "C"` and `extern "C-unwind"` functions may have a C variable argument list
 
 error[E0425]: cannot find type `F` in this scope
-  --> $DIR/issue-86053-1.rs:11:54
+  --> $DIR/issue-86053-1.rs:10:54
    |
 LL |     self , _: ... ,   self ,   self , _: ... ) where F : FnOnce ( & 'a & 'b usize ) {
    |                                                      ^

tests/ui/c-variadic/issue-86053-2.stderr

@@ -1,12 +1,12 @@
 error[E0491]: in type `&'static &'a ()`, reference has a longer lifetime than the data it references
-  --> $DIR/issue-86053-2.rs:8:39
+  --> $DIR/issue-86053-2.rs:6:39
    |
 LL | unsafe extern "C" fn ordering4<'a, F: H<&'static &'a ()>>(_: (), _: ...) {}
    |                                       ^^^^^^^^^^^^^^^^^^
    |
    = note: the pointer is valid for the static lifetime
 note: but the referenced data is only valid for the lifetime `'a` as defined here
-  --> $DIR/issue-86053-2.rs:8:32
+  --> $DIR/issue-86053-2.rs:6:32
    |
 LL | unsafe extern "C" fn ordering4<'a, F: H<&'static &'a ()>>(_: (), _: ...) {}
    |                                ^^

tests/ui/c-variadic/no-closure.stderr

@@ -1,21 +1,21 @@
 error: unexpected `...`
-  --> $DIR/no-closure.rs:6:35
+  --> $DIR/no-closure.rs:5:35
    |
 LL | const F: extern "C" fn(...) = |_: ...| {};
    |                                   ^^^
    |
    = note: only `extern "C"` and `extern "C-unwind"` functions may have a C variable argument list
 
 error: unexpected `...`
-  --> $DIR/no-closure.rs:11:14
+  --> $DIR/no-closure.rs:10:14
    |
 LL |     let f = |...| {};
    |              ^^^ not a valid pattern
    |
    = note: only `extern "C"` and `extern "C-unwind"` functions may have a C variable argument list
 
 error: unexpected `...`
-  --> $DIR/no-closure.rs:16:17
+  --> $DIR/no-closure.rs:15:17
    |
 LL |     let f = |_: ...| {};
    |                 ^^^

tests/ui/c-variadic/not-async.stderr

@@ -1,17 +1,17 @@
 error: functions cannot be both `async` and C-variadic
-  --> $DIR/not-async.rs:5:1
+  --> $DIR/not-async.rs:4:1
    |
 LL | async unsafe extern "C" fn fn_cannot_be_async(x: isize, _: ...) {}
    | ^^^^^ `async` because of this                           ^^^^^^ C-variadic because of this
 
 error: functions cannot be both `async` and C-variadic
-  --> $DIR/not-async.rs:12:5
+  --> $DIR/not-async.rs:11:5
    |
 LL |     async unsafe extern "C" fn method_cannot_be_async(x: isize, _: ...) {}
    |     ^^^^^ `async` because of this                               ^^^^^^ C-variadic because of this
 
 error[E0700]: hidden type for `impl Future<Output = ()>` captures lifetime that does not appear in bounds
-  --> $DIR/not-async.rs:5:65
+  --> $DIR/not-async.rs:4:65
    |
 LL | async unsafe extern "C" fn fn_cannot_be_async(x: isize, _: ...) {}
    |                                                                -^^
@@ -21,7 +21,7 @@ LL | async unsafe extern "C" fn fn_cannot_be_async(x: isize, _: ...) {}
    = note: hidden type `{async fn body of fn_cannot_be_async()}` captures lifetime `'_`
 
 error[E0700]: hidden type for `impl Future<Output = ()>` captures lifetime that does not appear in bounds
-  --> $DIR/not-async.rs:12:73
+  --> $DIR/not-async.rs:11:73
    |
 LL |     async unsafe extern "C" fn method_cannot_be_async(x: isize, _: ...) {}
    |                                                                        -^^

tests/ui/c-variadic/not-dyn-compatible.stderr

@@ -1,12 +1,12 @@
 error[E0038]: the trait `Trait` is not dyn compatible
-  --> $DIR/not-dyn-compatible.rs:27:30
+  --> $DIR/not-dyn-compatible.rs:26:30
    |
 LL |         let dyn_object: &dyn Trait = &Struct(64);
    |                              ^^^^^ `Trait` is not dyn compatible
    |
 note: for a trait to be dyn compatible it needs to allow building a vtable
       for more information, visit <https://doc.rust-lang.org/reference/items/traits.html#dyn-compatibility>
-  --> $DIR/not-dyn-compatible.rs:14:26
+  --> $DIR/not-dyn-compatible.rs:13:26
    |
 LL | trait Trait {
    |       ----- this trait is not dyn compatible...

tests/ui/c-variadic/variadic-ffi-4.stderr

@@ -1,5 +1,5 @@
 error: lifetime may not live long enough
-  --> $DIR/variadic-ffi-4.rs:8:5
+  --> $DIR/variadic-ffi-4.rs:7:5
    |
 LL | pub unsafe extern "C" fn no_escape0<'f>(_: usize, ap: ...) -> VaList<'f> {
    |                                     --            -- has type `VaList<'1>`
@@ -9,15 +9,15 @@ LL |     ap
    |     ^^ function was supposed to return data with lifetime `'f` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
-  --> $DIR/variadic-ffi-4.rs:13:5
+  --> $DIR/variadic-ffi-4.rs:12:5
    |
 LL | pub unsafe extern "C" fn no_escape1(_: usize, ap: ...) -> VaList<'static> {
    |                                               -- has type `VaList<'1>`
 LL |     ap
    |     ^^ returning this value requires that `'1` must outlive `'static`
 
 error: lifetime may not live long enough
-  --> $DIR/variadic-ffi-4.rs:17:5
+  --> $DIR/variadic-ffi-4.rs:16:5
    |
 LL | pub unsafe extern "C" fn no_escape3(_: usize, mut ap0: &mut VaList, mut ap1: ...) {
    |                                               -------               ------- has type `VaList<'1>`
@@ -27,7 +27,7 @@ LL |     *ap0 = ap1;
    |     ^^^^ assignment requires that `'1` must outlive `'2`
 
 error: lifetime may not live long enough
-  --> $DIR/variadic-ffi-4.rs:22:5
+  --> $DIR/variadic-ffi-4.rs:21:5
    |
 LL | pub unsafe extern "C" fn no_escape4(_: usize, mut ap0: &mut VaList, mut ap1: ...) {
    |                                               -------               ------- has type `VaList<'1>`
@@ -41,7 +41,7 @@ LL |     ap0 = &mut ap1;
    = help: see <https://doc.rust-lang.org/nomicon/subtyping.html> for more information about variance
 
 error: lifetime may not live long enough
-  --> $DIR/variadic-ffi-4.rs:22:5
+  --> $DIR/variadic-ffi-4.rs:21:5
    |
 LL | pub unsafe extern "C" fn no_escape4(_: usize, mut ap0: &mut VaList, mut ap1: ...) {
    |                                               -------               ------- has type `VaList<'1>`
@@ -55,7 +55,7 @@ LL |     ap0 = &mut ap1;
    = help: see <https://doc.rust-lang.org/nomicon/subtyping.html> for more information about variance
 
 error[E0597]: `ap1` does not live long enough
-  --> $DIR/variadic-ffi-4.rs:22:11
+  --> $DIR/variadic-ffi-4.rs:21:11
    |
 LL | pub unsafe extern "C" fn no_escape4(_: usize, mut ap0: &mut VaList, mut ap1: ...) {
    |                                                        -            ------- binding `ap1` declared here
@@ -71,7 +71,7 @@ LL | }
    | - `ap1` dropped here while still borrowed
 
 error: lifetime may not live long enough
-  --> $DIR/variadic-ffi-4.rs:29:5
+  --> $DIR/variadic-ffi-4.rs:28:5
    |
 LL | pub unsafe extern "C" fn no_escape5(_: usize, mut ap0: &mut VaList, mut ap1: ...) {
    |                                               -------               ------- has type `VaList<'1>`

tests/ui/c-variadic/variadic-ffi-6.rs

@@ -1,7 +1,7 @@
 #![crate_type = "lib"]
 
 pub unsafe extern "C" fn use_vararg_lifetime(x: usize, y: ...) -> &usize {
-    //~ ERROR missing lifetime specifier
+    //~^ ERROR missing lifetime specifier
     &0
 }
 

tests/ui/c-variadic/variadic-ffi-6.stderr

@@ -1,22 +1,22 @@
 error[E0106]: missing lifetime specifier
-  --> $DIR/variadic-ffi-6.rs:7:6
+  --> $DIR/variadic-ffi-6.rs:3:67
    |
-LL | ) -> &usize {
-   |      ^ expected named lifetime parameter
+LL | pub unsafe extern "C" fn use_vararg_lifetime(x: usize, y: ...) -> &usize {
+   |                                                                   ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
 help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static`
    |
-LL | ) -> &'static usize {
-   |       +++++++
+LL | pub unsafe extern "C" fn use_vararg_lifetime(x: usize, y: ...) -> &'static usize {
+   |                                                                    +++++++
 help: instead, you are more likely to want to change one of the arguments to be borrowed...
    |
-LL |     x: &usize,
-   |        +
+LL | pub unsafe extern "C" fn use_vararg_lifetime(x: &usize, y: ...) -> &usize {
+   |                                                 +
 help: ...or alternatively, you might want to return an owned value
    |
-LL - ) -> &usize {
-LL + ) -> usize {
+LL - pub unsafe extern "C" fn use_vararg_lifetime(x: usize, y: ...) -> &usize {
+LL + pub unsafe extern "C" fn use_vararg_lifetime(x: usize, y: ...) -> usize {
    |
 
 error: aborting due to 1 previous error

tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs

@@ -3,7 +3,7 @@
 //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
 //@ needs-llvm-components: arm
 //@ ignore-backends: gcc
-#![feature(cmse_nonsecure_entry, c_variadic, no_core, lang_items)]
+#![feature(cmse_nonsecure_entry, no_core, lang_items)]
 #![no_core]
 
 extern crate minicore;