Port all tests

tests/fail/box-cell-alias.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-strict-provenance
+//@compile-flags: -Zmiri-strict-provenance
 
 // Taken from <https://github.com/rust-lang/unsafe-code-guidelines/issues/194#issuecomment-520934222>.
 

tests/fail/concurrency/libc_pthread_join_detached.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 
 // Joining a detached thread is undefined behavior.
 

tests/fail/concurrency/libc_pthread_join_joined.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 
 // Joining an already joined thread is undefined behavior.
 

tests/fail/concurrency/libc_pthread_join_main.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 
 // Joining the main thread is undefined behavior.
 

tests/fail/concurrency/libc_pthread_join_multiple.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 
 // Joining the same thread from multiple threads is undefined behavior.
 

tests/fail/concurrency/libc_pthread_join_self.rs

@@ -1,6 +1,6 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 // We are making scheduler assumptions here.
-// compile-flags: -Zmiri-preemption-rate=0
+//@compile-flags: -Zmiri-preemption-rate=0
 
 // Joining itself is undefined behavior.
 

tests/fail/concurrency/thread_local_static_dealloc.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 //! Ensure that thread-local statics get deallocated when the thread dies.
 

tests/fail/concurrency/too_few_args.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 //! The thread function must have exactly one argument.
 

tests/fail/concurrency/too_many_args.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 //! The thread function must have exactly one argument.
 

tests/fail/concurrency/unwind_top_of_stack.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-abi-check
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-abi-check
 
 //! Unwinding past the top frame of a stack is Undefined Behavior.
 

tests/fail/dangling_pointers/dangling_pointer_addr_of.rs

@@ -1,5 +1,5 @@
 // Make sure we find these even with many checks disabled.
-// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 use std::ptr;
 
 fn main() {

tests/fail/dangling_pointers/dangling_pointer_deref.rs

@@ -1,5 +1,5 @@
 // Make sure we find these even with many checks disabled.
-// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 
 fn main() {
     let p = {

tests/fail/dangling_pointers/dangling_zst_deref.rs

@@ -1,6 +1,6 @@
 // Make sure we find these even with many checks disabled.
 // Some optimizations remove ZST accesses, thus masking this UB.
-// compile-flags: -Zmir-opt-level=0 -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+//@compile-flags: -Zmir-opt-level=0 -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 
 fn main() {
     let p = {

tests/fail/dangling_pointers/deref-invalid-ptr.rs

@@ -1,5 +1,5 @@
 // This should fail even without validation.
-// compile-flags: -Zmiri-disable-validation -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-disable-validation -Zmiri-permissive-provenance
 
 fn main() {
     let x = 16usize as *const u32;

tests/fail/dangling_pointers/dyn_size.rs

@@ -1,5 +1,5 @@
 // should find the bug even without these, but gets masked by optimizations
-// compile-flags: -Zmiri-disable-validation -Zmiri-disable-stacked-borrows -Zmir-opt-level=0
+//@compile-flags: -Zmiri-disable-validation -Zmiri-disable-stacked-borrows -Zmir-opt-level=0
 
 struct SliceWithHead(u8, [u8]);
 

tests/fail/dangling_pointers/maybe_null_pointer_deref_zst.rs

@@ -1,5 +1,5 @@
 // Some optimizations remove ZST accesses, thus masking this UB.
-// compile-flags: -Zmir-opt-level=0
+//@compile-flags: -Zmir-opt-level=0
 
 fn main() {
     // This pointer *could* be NULL so we cannot load from it, not even at ZST

tests/fail/dangling_pointers/maybe_null_pointer_write_zst.rs

@@ -1,5 +1,5 @@
 // Some optimizations remove ZST accesses, thus masking this UB.
-// compile-flags: -Zmir-opt-level=0
+//@compile-flags: -Zmir-opt-level=0
 
 fn main() {
     // This pointer *could* be NULL so we cannot load from it, not even at ZST.

tests/fail/dangling_pointers/null_pointer_deref_zst.rs

@@ -1,5 +1,5 @@
 // Some optimizations remove ZST accesses, thus masking this UB.
-// compile-flags: -Zmir-opt-level=0
+//@compile-flags: -Zmir-opt-level=0
 
 #[allow(deref_nullptr)]
 fn main() {

tests/fail/dangling_pointers/stack_temporary.rs

@@ -1,5 +1,5 @@
 // This should fail even without validation, but some MIR opts mask the error
-// compile-flags: -Zmiri-disable-validation -Zmir-opt-level=0
+//@compile-flags: -Zmiri-disable-validation -Zmir-opt-level=0
 
 unsafe fn make_ref<'a>(x: *mut i32) -> &'a mut i32 {
     &mut *x

tests/fail/dangling_pointers/storage_dead_dangling.rs

@@ -1,5 +1,5 @@
 // This should fail even without validation, but some MIR opts mask the error
-// compile-flags: -Zmiri-disable-validation -Zmir-opt-level=0 -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-disable-validation -Zmir-opt-level=0 -Zmiri-permissive-provenance
 
 static mut LEAK: usize = 0;
 

tests/fail/dangling_pointers/wild_pointer_deref.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-permissive-provenance
 
 fn main() {
     let p = 44 as *const i32;

tests/fail/data_race/alloc_read_race.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 #![feature(new_uninit)]
 
 use std::mem::MaybeUninit;

tests/fail/data_race/alloc_write_race.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 #![feature(new_uninit)]
 
 use std::ptr::null_mut;

tests/fail/data_race/atomic_read_na_write_race1.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 #![feature(core_intrinsics)]
 
 use std::intrinsics;

tests/fail/data_race/atomic_read_na_write_race2.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;

tests/fail/data_race/atomic_write_na_read_race1.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;

tests/fail/data_race/atomic_write_na_read_race2.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 #![feature(core_intrinsics)]
 
 use std::intrinsics::atomic_store;

tests/fail/data_race/atomic_write_na_write_race1.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 #![feature(core_intrinsics)]
 
 use std::intrinsics::atomic_store;

tests/fail/data_race/atomic_write_na_write_race2.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;

tests/fail/data_race/dangling_thread_async_race.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-isolation
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-isolation
 
 use std::mem;
 use std::thread::{sleep, spawn};

tests/fail/data_race/dangling_thread_race.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-isolation
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-isolation
 
 use std::mem;
 use std::thread::{sleep, spawn};

tests/fail/data_race/dealloc_read_race1.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 

tests/fail/data_race/dealloc_read_race2.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 

tests/fail/data_race/dealloc_read_race_stack.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::ptr::null_mut;
 use std::sync::atomic::{AtomicPtr, Ordering};

tests/fail/data_race/dealloc_write_race1.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 

tests/fail/data_race/dealloc_write_race2.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 

tests/fail/data_race/dealloc_write_race_stack.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::ptr::null_mut;
 use std::sync::atomic::{AtomicPtr, Ordering};

tests/fail/data_race/enable_after_join_to_main.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 

tests/fail/data_race/fence_after_load.rs

@@ -1,6 +1,6 @@
 // We want to control preemption here.
-// compile-flags: -Zmiri-disable-isolation -Zmiri-preemption-rate=0
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-isolation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
 use std::sync::atomic::{fence, AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::thread;

tests/fail/data_race/read_write_race.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 

tests/fail/data_race/read_write_race_stack.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-isolation -Zmir-opt-level=0 -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-isolation -Zmir-opt-level=0 -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 // Note: mir-opt-level set to 0 to prevent the read of stack_var in thread 1
 // from being optimized away and preventing the detection of the data-race.

tests/fail/data_race/relax_acquire_race.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::thread::spawn;

tests/fail/data_race/release_seq_race.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::thread::{sleep, spawn};

tests/fail/data_race/release_seq_race_same_thread.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::thread::spawn;

tests/fail/data_race/rmw_race.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::thread::spawn;

tests/fail/data_race/stack_pop_race.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-preemption-rate=0
 use std::thread;
 
 #[derive(Copy, Clone)]

tests/fail/data_race/write_write_race.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 

tests/fail/data_race/write_write_race_stack.rs

@@ -1,5 +1,5 @@
-// ignore-windows: Concurrency on Windows is not supported yet.
-// compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
+//@ignore-windows: Concurrency on Windows is not supported yet.
+//@compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::ptr::null_mut;
 use std::sync::atomic::{AtomicPtr, Ordering};

tests/fail/environ-gets-deallocated.rs

@@ -1,4 +1,4 @@
-// ignore-windows: Windows does not have a global environ list that the program can access directly
+//@ignore-windows: Windows does not have a global environ list that the program can access directly
 
 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
 fn get_environ() -> *const *const u8 {

tests/fail/erroneous_const.rs

@@ -1,7 +1,7 @@
 //! Make sure we detect erroneous constants post-monomorphization even when they are unused.
 //! (https://github.com/rust-lang/miri/issues/1382)
 // Inlining changes the error location
-// compile-flags: -Zmir-opt-level=0
+//@compile-flags: -Zmir-opt-level=0
 #![feature(never_type)]
 #![warn(warnings, const_err)]
 

tests/fail/fs/close_stdout.rs

@@ -1,5 +1,5 @@
-// ignore-windows: No libc on Windows
-// compile-flags: -Zmiri-disable-isolation
+//@ignore-windows: No libc on Windows
+//@compile-flags: -Zmiri-disable-isolation
 
 // FIXME: standard handles cannot be closed (https://github.com/rust-lang/rust/issues/40032)
 

tests/fail/fs/isolated_stdin.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 
 #![feature(rustc_private)]
 

tests/fail/fs/read_from_stdout.rs

@@ -1,5 +1,5 @@
-// compile-flags: -Zmiri-disable-isolation
-// ignore-windows: No libc on Windows
+//@compile-flags: -Zmiri-disable-isolation
+//@ignore-windows: No libc on Windows
 
 #![feature(rustc_private)]
 

tests/fail/fs/unix_open_missing_required_mode.rs

@@ -1,5 +1,5 @@
-// ignore-windows: No libc on Windows
-// compile-flags: -Zmiri-disable-isolation
+//@ignore-windows: No libc on Windows
+//@compile-flags: -Zmiri-disable-isolation
 
 #![feature(rustc_private)]
 

tests/fail/fs/write_to_stdin.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 
 #![feature(rustc_private)]
 

tests/fail/function_calls/exported_symbol_abi_mismatch.rs

@@ -1,4 +1,4 @@
-// revisions: no_cache cache fn_ptr
+//@revisions: no_cache cache fn_ptr
 
 #[no_mangle]
 fn foo() {}

tests/fail/function_calls/exported_symbol_bad_unwind1.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-disable-abi-check
+//@compile-flags: -Zmiri-disable-abi-check
 #![feature(c_unwind)]
 
 #[no_mangle]

tests/fail/function_calls/exported_symbol_bad_unwind2.rs

@@ -1,4 +1,4 @@
-// revisions: extern_block definition both
+//@revisions: extern_block definition both
 #![feature(rustc_attrs, c_unwind)]
 
 #[cfg_attr(any(definition, both), rustc_allocator_nounwind)]

tests/fail/function_pointers/cast_box_int_to_fn_ptr.rs

@@ -1,5 +1,5 @@
 // Validation makes this fail in the wrong place
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 
 fn main() {
     let b = Box::new(42);

tests/fail/function_pointers/cast_int_to_fn_ptr.rs

@@ -1,5 +1,5 @@
 // Validation makes this fail in the wrong place
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 
 fn main() {
     let g = unsafe { std::mem::transmute::<usize, fn(i32)>(42) };

tests/fail/function_pointers/execute_memory.rs

@@ -1,5 +1,5 @@
 // Validation makes this fail in the wrong place
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 
 #![feature(box_syntax)]
 

tests/fail/function_pointers/fn_ptr_offset.rs

@@ -1,5 +1,5 @@
 // Validation makes this fail in the wrong place
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 
 use std::mem;
 

tests/fail/generator-pinned-moved.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 #![feature(generators, generator_trait)]
 
 use std::{

tests/fail/invalid_bool.rs

@@ -1,6 +1,6 @@
 // Validation makes this fail in the wrong place
 // Make sure we find these even with many checks disabled.
-// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 #![feature(bench_black_box)]
 
 fn main() {

tests/fail/invalid_char.rs

@@ -1,6 +1,6 @@
 // Validation makes this fail in the wrong place
 // Make sure we find these even with many checks disabled.
-// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 
 fn main() {
     let c = 0xFFFFFFu32;

tests/fail/invalid_int.rs

@@ -1,6 +1,6 @@
 // Validation makes this fail in the wrong place
 // Make sure we find these even with many checks disabled.
-// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 
 fn main() {
     let i = unsafe { std::mem::MaybeUninit::<i32>::uninit().assume_init() };

tests/fail/modifying_constants.rs

@@ -1,5 +1,5 @@
 // This should fail even without validation/SB
-// compile-flags: -Zmiri-disable-validation -Zmiri-disable-stacked-borrows
+//@compile-flags: -Zmiri-disable-validation -Zmiri-disable-stacked-borrows
 
 fn main() {
     let x = &1; // the `&1` is promoted to a constant, but it used to be that only the pointer is marked static, not the pointee

tests/fail/never_say_never.rs

@@ -1,5 +1,5 @@
 // This should fail even without validation
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 
 #![feature(never_type)]
 #![allow(unreachable_code)]

tests/fail/never_transmute_humans.rs

@@ -1,5 +1,5 @@
 // This should fail even without validation
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 
 #![feature(never_type)]
 

tests/fail/never_transmute_void.rs

@@ -1,5 +1,5 @@
 // This should fail even without validation
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 
 #![feature(never_type)]
 #![allow(unused, invalid_value)]

tests/fail/panic/bad_miri_start_panic.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-disable-abi-check
+//@compile-flags: -Zmiri-disable-abi-check
 // This feature is required to trigger the error using the "C" ABI.
 #![feature(c_unwind)]
 

tests/fail/panic/unwind_panic_abort.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Cpanic=abort
+//@compile-flags: -Cpanic=abort
 
 //! Unwinding despite `-C panic=abort` is an error.
 

tests/fail/pointer_partial_overwrite.rs

@@ -1,5 +1,5 @@
 // Make sure we find these even with many checks disabled.
-// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 
 // Test what happens when we overwrite parts of a pointer.
 // Also see <https://github.com/rust-lang/miri/issues/2181>.

tests/fail/provenance/provenance_transmute.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-permissive-provenance
 #![feature(strict_provenance)]
 
 use std::mem;

tests/fail/provenance/ptr_int_unexposed.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-permissive-provenance
 #![feature(strict_provenance)]
 
 fn main() {

tests/fail/provenance/strict_provenance_cast.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-strict-provenance
+//@compile-flags: -Zmiri-strict-provenance
 
 fn main() {
     let addr = &0 as *const i32 as usize;

tests/fail/rc_as_ptr.rs

@@ -1,5 +1,5 @@
 // This should fail even without validation
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 
 use std::ptr;
 use std::rc::{Rc, Weak};

tests/fail/shim_arg_size.rs

@@ -1,4 +1,4 @@
-// stderr-per-bitwidth
+//@stderr-per-bitwidth
 
 fn main() {
     extern "C" {

tests/fail/stacked_borrows/exposed_only_ro.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-permissive-provenance
 #![feature(strict_provenance)]
 
 // If we have only exposed read-only pointers, doing a write through a wildcard ptr should fail.

tests/fail/stacked_borrows/illegal_read5.rs

@@ -1,6 +1,6 @@
 // We *can* have aliasing &RefCell<T> and &mut T, but we cannot read through the former.
 // Else we couldn't optimize based on the assumption that `xref` below is truly unique.
-// normalize-stderr-test: "0x[0-9a-fA-F]+" -> "$$HEX"
+//@normalize-stderr-test: "0x[0-9a-fA-F]+" -> "$$HEX"
 
 use std::cell::RefCell;
 use std::{mem, ptr};

tests/fail/stacked_borrows/illegal_read_despite_exposed1.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-permissive-provenance
 
 fn main() {
     unsafe {

tests/fail/stacked_borrows/illegal_read_despite_exposed2.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-permissive-provenance
 
 fn main() {
     unsafe {

tests/fail/stacked_borrows/illegal_write_despite_exposed1.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-permissive-provenance
 
 fn main() {
     unsafe {

tests/fail/stacked_borrows/load_invalid_mut.rs

@@ -1,5 +1,5 @@
 // Make sure we catch this even without validation
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 
 // Make sure that we cannot load from memory a `&mut` that got already invalidated.
 fn main() {

tests/fail/stacked_borrows/load_invalid_shr.rs

@@ -1,5 +1,5 @@
 // Make sure we catch this even without validation
-// compile-flags: -Zmiri-disable-validation
+//@compile-flags: -Zmiri-disable-validation
 
 // Make sure that we cannot load from memory a `&` that got already invalidated.
 fn main() {

tests/fail/stacked_borrows/shared_rw_borrows_are_weak2.rs

@@ -1,7 +1,7 @@
 // We want to test that granting a SharedReadWrite will be added
 // *below* an already granted SharedReadWrite -- so writing to
 // the SharedReadWrite will invalidate the SharedReadWrite.
-// normalize-stderr-test: "0x[0-9a-fA-F]+" -> "$$HEX"
+//@normalize-stderr-test: "0x[0-9a-fA-F]+" -> "$$HEX"
 
 use std::cell::RefCell;
 use std::mem;

tests/fail/stacked_borrows/unescaped_local.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-permissive-provenance
 
 // Make sure we cannot use raw ptrs to access a local that
 // we took the direct address of.

tests/fail/stacked_borrows/zst_slice.rs

@@ -1,4 +1,4 @@
-// compile-flags: -Zmiri-strict-provenance
+//@compile-flags: -Zmiri-strict-provenance
 //@error-pattern: does not exist in the borrow stack
 
 fn main() {

tests/fail/static_memory_modification1.rs

@@ -1,5 +1,5 @@
 // Stacked Borrows detects that we are casting & to &mut and so it changes why we fail
-// compile-flags: -Zmiri-disable-stacked-borrows
+//@compile-flags: -Zmiri-disable-stacked-borrows
 
 static X: usize = 5;
 

tests/fail/static_memory_modification2.rs

@@ -1,5 +1,5 @@
 // Stacked Borrows detects that we are casting & to &mut and so it changes why we fail
-// compile-flags: -Zmiri-disable-stacked-borrows
+//@compile-flags: -Zmiri-disable-stacked-borrows
 
 use std::mem::transmute;
 

tests/fail/static_memory_modification3.rs

@@ -1,5 +1,5 @@
 // Stacked Borrows detects that we are casting & to &mut and so it changes why we fail
-// compile-flags: -Zmiri-disable-stacked-borrows
+//@compile-flags: -Zmiri-disable-stacked-borrows
 
 use std::mem::transmute;
 

tests/fail/sync/libc_pthread_cond_double_destroy.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 #![feature(rustc_private)]
 
 /// Test that destroying a pthread_cond twice fails, even without a check for number validity

tests/fail/sync/libc_pthread_condattr_double_destroy.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 #![feature(rustc_private)]
 
 /// Test that destroying a pthread_condattr twice fails, even without a check for number validity

tests/fail/sync/libc_pthread_mutex_NULL_deadlock.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 //
 // Check that if we pass NULL attribute, then we get the default mutex type.
 

tests/fail/sync/libc_pthread_mutex_deadlock.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 
 #![feature(rustc_private)]
 

tests/fail/sync/libc_pthread_mutex_default_deadlock.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 //
 // Check that if we do not set the mutex type, it is the default.
 

tests/fail/sync/libc_pthread_mutex_destroy_locked.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 
 #![feature(rustc_private)]
 

tests/fail/sync/libc_pthread_mutex_double_destroy.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 #![feature(rustc_private)]
 
 /// Test that destroying a pthread_mutex twice fails, even without a check for number validity

tests/fail/sync/libc_pthread_mutex_normal_deadlock.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 
 #![feature(rustc_private)]
 

tests/fail/sync/libc_pthread_mutex_normal_unlock_unlocked.rs

@@ -1,4 +1,4 @@
-// ignore-windows: No libc on Windows
+//@ignore-windows: No libc on Windows
 
 #![feature(rustc_private)]