Fix test output after rebase.

Author: Patrick-6

tests/genmc/fail/intercept/mutex_deadlock_std.stderr

@@ -12,7 +12,7 @@ LL |                 intrinsics::atomic_cxchgweak::<T, { AO::Relaxed }, { AO::Re
    = note: inside closure at RUSTLIB/std/src/thread/current.rs:LL:CC
    = note: inside `std::option::Option::<std::thread::ThreadId>::unwrap_or_else::<{closure@std::thread::current::id::get_or_init::{closure#0}}>` at RUSTLIB/core/src/option.rs:LL:CC
    = note: inside `std::thread::current::id::get_or_init` at RUSTLIB/std/src/thread/current.rs:LL:CC
-   = note: inside `std::thread::current::current_id` at RUSTLIB/std/src/thread/current.rs:LL:CC
+   = note: inside `std::thread::current_id` at RUSTLIB/std/src/thread/current.rs:LL:CC
    = note: inside `std::rt::init` at RUSTLIB/std/src/rt.rs:LL:CC
    = note: inside closure at RUSTLIB/std/src/rt.rs:LL:CC
    = note: inside `std::panicking::catch_unwind::do_call::<{closure@std::rt::lang_start_internal::{closure#0}}, isize>` at RUSTLIB/std/src/panicking.rs:LL:CC
@@ -85,26 +85,6 @@ LL | |         *y += 1;
 LL | |     });
    | |______^
 
-warning: GenMC currently does not model spurious failures of `compare_exchange_weak`. Miri with GenMC might miss bugs related to spurious failures.
-  --> RUSTLIB/std/src/thread/mod.rs:LL:CC
-   |
-LL |                     match COUNTER.compare_exchange_weak(last, id, Ordering::Relaxed, Ordering::Relaxed) {
-   |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GenMC might miss possible behaviors of this code
-   |
-   = note: BACKTRACE:
-   = note: inside `std::thread::ThreadId::new` at RUSTLIB/std/src/thread/mod.rs:LL:CC
-note: inside `main`
-  --> tests/genmc/fail/intercept/mutex_deadlock_std.rs:LL:CC
-   |
-LL |       let t1 = std::thread::spawn(|| {
-   |  ______________^
-LL | |         let mut y = Y.lock().unwrap();
-LL | |         let mut x = X.lock().unwrap();
-LL | |         *x += 1;
-LL | |         *y += 1;
-LL | |     });
-   | |______^
-
 warning: GenMC currently does not model the failure ordering for `compare_exchange`. Due to success ordering 'Acquire', the failure ordering 'Relaxed' is treated like 'Acquire'. Miri with GenMC might miss bugs related to this memory access.
   --> RUSTLIB/alloc/src/sync.rs:LL:CC
    |
@@ -122,23 +102,6 @@ note: inside `main`
 LL |     t0.join().unwrap();
    |     ^^^^^^^^^
 
-warning: GenMC currently does not model the failure ordering for `compare_exchange`. Due to success ordering 'Acquire', the failure ordering 'Relaxed' is treated like 'Acquire'. Miri with GenMC might miss bugs related to this memory access.
-  --> RUSTLIB/alloc/src/sync.rs:LL:CC
-   |
-LL |         if this.inner().weak.compare_exchange(1, usize::MAX, Acquire, Relaxed).is_ok() {
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GenMC might miss possible behaviors of this code
-   |
-   = note: BACKTRACE:
-   = note: inside `std::sync::Arc::<std::thread::Packet<'_, ()>>::is_unique` at RUSTLIB/alloc/src/sync.rs:LL:CC
-   = note: inside `std::sync::Arc::<std::thread::Packet<'_, ()>>::get_mut` at RUSTLIB/alloc/src/sync.rs:LL:CC
-   = note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
-   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
-note: inside `main`
-  --> tests/genmc/fail/intercept/mutex_deadlock_std.rs:LL:CC
-   |
-LL |     t1.join().unwrap();
-   |     ^^^^^^^^^
-
 warning: GenMC currently does not model spurious failures of `compare_exchange_weak`. Miri with GenMC might miss bugs related to spurious failures.
   --> RUSTLIB/core/src/sync/atomic.rs:LL:CC
    |
@@ -223,5 +186,5 @@ note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a
 
 note: add `-Zmiri-genmc-print-genmc-output` to MIRIFLAGS to see the detailed GenMC error report
 
-error: aborting due to 3 previous errors; 8 warnings emitted
+error: aborting due to 3 previous errors; 6 warnings emitted
 

tests/genmc/pass/intercept/mutex_poison.stderr

@@ -61,50 +61,6 @@ LL | |         panic!(); // This will poison the mutex.
 LL | |     });
    | |______^
 
-warning: GenMC currently does not model the failure ordering for `compare_exchange`. Due to success ordering 'Acquire', the failure ordering 'Relaxed' is treated like 'Acquire'. Miri with GenMC might miss bugs related to this memory access.
-  --> RUSTLIB/std/src/sys/sync/PLATFORM/futex.rs:LL:CC
-   |
-LL |               || self
-   |  ________________^
-LL | |                 .state
-LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquire, Relaxed)
-   | |____________________________________________________________________________________^ GenMC might miss possible behaviors of this code
-   |
-   = note: BACKTRACE on thread `unnamed-ID`:
-   = note: inside `std::sys::sync::PLATFORM::futex::RwLock::read` at RUSTLIB/std/src/sys/sync/PLATFORM/futex.rs:LL:CC
-   = note: inside `std::sync::RwLock::<std::panicking::Hook>::read` at RUSTLIB/std/src/sync/poison/rwlock.rs:LL:CC
-   = note: inside `std::panicking::panic_with_hook` at RUSTLIB/std/src/panicking.rs:LL:CC
-   = note: inside closure at RUSTLIB/std/src/panicking.rs:LL:CC
-   = note: inside `std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys/backtrace.rs:LL:CC
-   = note: inside `std::panicking::panic_handler` at RUSTLIB/std/src/panicking.rs:LL:CC
-note: inside closure
-  --> tests/genmc/pass/intercept/mutex_poison.rs:LL:CC
-   |
-LL |         panic!(); // This will poison the mutex.
-   |         ^^^^^^^^
-
-warning: GenMC currently does not model spurious failures of `compare_exchange_weak`. Miri with GenMC might miss bugs related to spurious failures.
-  --> RUSTLIB/std/src/sys/sync/PLATFORM/futex.rs:LL:CC
-   |
-LL |               || self
-   |  ________________^
-LL | |                 .state
-LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquire, Relaxed)
-   | |____________________________________________________________________________________^ GenMC might miss possible behaviors of this code
-   |
-   = note: BACKTRACE on thread `unnamed-ID`:
-   = note: inside `std::sys::sync::PLATFORM::futex::RwLock::read` at RUSTLIB/std/src/sys/sync/PLATFORM/futex.rs:LL:CC
-   = note: inside `std::sync::RwLock::<std::panicking::Hook>::read` at RUSTLIB/std/src/sync/poison/rwlock.rs:LL:CC
-   = note: inside `std::panicking::panic_with_hook` at RUSTLIB/std/src/panicking.rs:LL:CC
-   = note: inside closure at RUSTLIB/std/src/panicking.rs:LL:CC
-   = note: inside `std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys/backtrace.rs:LL:CC
-   = note: inside `std::panicking::panic_handler` at RUSTLIB/std/src/panicking.rs:LL:CC
-note: inside closure
-  --> tests/genmc/pass/intercept/mutex_poison.rs:LL:CC
-   |
-LL |         panic!(); // This will poison the mutex.
-   |         ^^^^^^^^
-
 
 thread '<unnamed>' ($TID) panicked at tests/genmc/pass/intercept/mutex_poison.rs:LL:CC:
 explicit panic