Update tests

Author: mu001999

tests/codegen-llvm/cf-protection.rs

@@ -1,12 +1,12 @@
 // Test that the correct module flags are emitted with different control-flow protection flags.
 
 //@ add-core-stubs
-//@ revisions: undefined none branch return full
+//@ revisions: undefined none branch return_ full
 //@ needs-llvm-components: x86
 // [undefined] no extra compile-flags
 //@ [none] compile-flags: -Z cf-protection=none
 //@ [branch] compile-flags: -Z cf-protection=branch
-//@ [return] compile-flags: -Z cf-protection=return
+//@ [return_] compile-flags: -Z cf-protection=return
 //@ [full] compile-flags: -Z cf-protection=full
 //@ compile-flags: --target x86_64-unknown-linux-gnu
 
@@ -30,9 +30,9 @@ pub fn test() {}
 // branch: !"cf-protection-branch", i32 1
 // branch-NOT: !"cf-protection-return"
 
-// return-NOT: !"cf-protection-branch"
-// return: !"cf-protection-return", i32 1
-// return-NOT: !"cf-protection-branch"
+// return_-NOT: !"cf-protection-branch"
+// return_: !"cf-protection-return", i32 1
+// return_-NOT: !"cf-protection-branch"
 
 // full: !"cf-protection-branch", i32 1
 // full: !"cf-protection-return", i32 1

tests/ui/cfg/cmdline-false.rs

@@ -1,5 +1,5 @@
 /// Test that `--cfg false` doesn't cause `cfg(false)` to evaluate to `true`
-//@ compile-flags: --cfg false
+//@ compile-flags: --cfg r#false
 
 #[cfg(false)]
 fn foo() {}

tests/ui/cfg/raw-true-false.rs

@@ -1,9 +1,5 @@
 //@ check-pass
-//@ revisions: r0x0 r0x1 r1x0 r1x1
-//@[r0x0] compile-flags: --cfg false --check-cfg=cfg(false)
-//@[r0x1] compile-flags: --cfg false --check-cfg=cfg(r#false)
-//@[r1x0] compile-flags: --cfg r#false --check-cfg=cfg(false)
-//@[r1x1] compile-flags: --cfg r#false --check-cfg=cfg(r#false)
+//@ compile-flags: --cfg r#false --check-cfg=cfg(r#false)
 #![deny(unexpected_cfgs)]
 fn main() {
     #[cfg(not(r#false))]

tests/ui/check-cfg/raw-keywords.rs

@@ -3,7 +3,7 @@
 //
 //@ check-pass
 //@ no-auto-check-cfg
-//@ compile-flags: --cfg=true --cfg=async --check-cfg=cfg(r#true,r#async,edition2015,edition2021)
+//@ compile-flags: --cfg=r#true --cfg=r#async --check-cfg=cfg(r#true,r#async,edition2015,edition2021)
 //
 //@ revisions: edition2015 edition2021
 //@ [edition2015] edition: 2015

tests/ui/explicit-tail-calls/ctfe-id-unlimited.return.stderr renamed to tests/ui/explicit-tail-calls/ctfe-id-unlimited.return_.stderr

@@ -1,21 +1,21 @@
 error[E0080]: reached the configured maximum number of stack frames
-  --> $DIR/ctfe-id-unlimited.rs:28:20
+  --> $DIR/ctfe-id-unlimited.rs:32:20
    |
 LL | const ID_ED: u32 = rec_id(ORIGINAL);
    |                    ^^^^^^^^^^^^^^^^ evaluation of `ID_ED` failed inside this call
    |
 note: inside `rec_id`
-  --> $DIR/ctfe-id-unlimited.rs:21:5
+  --> $DIR/ctfe-id-unlimited.rs:25:5
    |
 LL |     inner(0, n)
    |     ^^^^^^^^^^^
 note: [... 125 additional calls inside `inner` ...]
-  --> $DIR/ctfe-id-unlimited.rs:17:42
+  --> $DIR/ctfe-id-unlimited.rs:21:42
    |
 LL |             #[cfg(r#return)] _ => return inner(acc + 1, n - 1),
    |                                          ^^^^^^^^^^^^^^^^^^^^^
 note: inside `inner`
-  --> $DIR/ctfe-id-unlimited.rs:17:42
+  --> $DIR/ctfe-id-unlimited.rs:21:42
    |
 LL |             #[cfg(r#return)] _ => return inner(acc + 1, n - 1),
    |                                          ^^^^^^^^^^^^^^^^^^^^^ the failure occurred here

tests/ui/explicit-tail-calls/ctfe-id-unlimited.rs

@@ -1,5 +1,9 @@
-//@ revisions: become return
-//@ [become] run-pass
+//@ revisions: become_ return_
+//@ [become_] run-pass
+//@ [become_] compile-flags: --cfg r#become
+//@ [return_] compile-flags: --cfg r#return
+
+#![allow(unexpected_cfgs)]
 #![expect(incomplete_features)]
 #![feature(explicit_tail_calls)]
 
@@ -25,7 +29,7 @@ const fn rec_id(n: u32) -> u32 {
 const ORIGINAL: u32 = 12345;
 // Original number, but with identity function applied
 // (this is the same, but requires execution of the recursion)
-const ID_ED: u32 = rec_id(ORIGINAL); //[return]~ ERROR: reached the configured maximum number of stack frames
+const ID_ED: u32 = rec_id(ORIGINAL); //[return_]~ ERROR: reached the configured maximum number of stack frames
 // Assert to make absolutely sure the computation actually happens
 const ASSERT: () = assert!(ORIGINAL == ID_ED);