Rename 'intercept' to 'shims'

Author: Patrick-6

src/concurrency/genmc/mod.rs

@@ -27,15 +27,15 @@ use crate::*;
 mod config;
 mod global_allocations;
 mod helper;
-mod intercept;
+mod shims;
 mod run;
 pub(crate) mod scheduling;
 mod thread_id_map;
 
 pub use genmc_sys::GenmcParams;
 
 pub use self::config::GenmcConfig;
-pub use self::intercept::EvalContextExt as GenmcEvalContextExt;
+pub use self::shims::EvalContextExt as GenmcEvalContextExt;
 pub use self::run::run_genmc_mode;
 
 #[derive(Debug)]

src/concurrency/genmc/intercept.rs renamed to src/concurrency/genmc/shims.rs

@@ -3,8 +3,8 @@
 
 // Test that GenMC throws an error if a `std::sync::Mutex` is unlocked from a different thread than the one that locked it.
 //
-// GenMC assumes a `pthread`-like API, which does not allow unlocking a mutex from a different thread.
-// This test will cause an error on all platforms, even if that platform allows for unlocking on a different thread.
+// This test will cause an error on all targets, even mutexes on that targets allow for unlocking on a different thread.
+// GenMC always assumes a `pthread`-like API.
 
 #![no_main]
 

tests/genmc/fail/intercept/mutex_diff_thread_unlock.rs renamed to tests/genmc/fail/shims/mutex_diff_thread_unlock.rs

@@ -20,7 +20,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    = note: inside `std::env::var_os::<&str>` at RUSTLIB/std/src/env.rs:LL:CC
    = note: inside closure at RUSTLIB/std/src/thread/mod.rs:LL:CC
 note: inside `miri_start`
-  --> tests/genmc/fail/intercept/mutex_diff_thread_unlock.rs:LL:CC
+  --> tests/genmc/fail/shims/mutex_diff_thread_unlock.rs:LL:CC
    |
 LL |       let handle = std::thread::spawn(move || {
    |  __________________^
@@ -50,7 +50,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    = note: inside `std::env::var_os::<&str>` at RUSTLIB/std/src/env.rs:LL:CC
    = note: inside closure at RUSTLIB/std/src/thread/mod.rs:LL:CC
 note: inside `miri_start`
-  --> tests/genmc/fail/intercept/mutex_diff_thread_unlock.rs:LL:CC
+  --> tests/genmc/fail/shims/mutex_diff_thread_unlock.rs:LL:CC
    |
 LL |       let handle = std::thread::spawn(move || {
    |  __________________^
@@ -73,7 +73,7 @@ LL |             self.lock.inner.unlock();
    = note: inside `std::ptr::drop_in_place::<EvilSend<std::sync::MutexGuard<'_, u64>>> - shim(Some(EvilSend<std::sync::MutexGuard<'_, u64>>))` at RUSTLIB/core/src/ptr/mod.rs:LL:CC
    = note: inside `std::mem::drop::<EvilSend<std::sync::MutexGuard<'_, u64>>>` at RUSTLIB/core/src/mem/mod.rs:LL:CC
 note: inside closure
-  --> tests/genmc/fail/intercept/mutex_diff_thread_unlock.rs:LL:CC
+  --> tests/genmc/fail/shims/mutex_diff_thread_unlock.rs:LL:CC
    |
 LL |         drop(guard);
    |         ^^^^^^^^^^^

tests/genmc/fail/intercept/mutex_diff_thread_unlock.stderr renamed to tests/genmc/fail/shims/mutex_diff_thread_unlock.stderr

@@ -1,7 +1,7 @@
 //@compile-flags: -Zmiri-genmc -Zmiri-disable-stacked-borrows
 //@error-in-other-file: Undefined Behavior
 
-// Test that GenMC can detect a double unlock of a `std::sync::Mutex`.
+// Test that GenMC can detect a double unlock of a mutex.
 
 #![no_main]
 

tests/genmc/fail/intercept/mutex_double_unlock.rs renamed to tests/genmc/fail/shims/mutex_double_unlock.rs

@@ -12,7 +12,7 @@ LL |             self.lock.inner.unlock();
    = note: inside `std::ptr::drop_in_place::<std::sync::MutexGuard<'_, u64>> - shim(Some(std::sync::MutexGuard<'_, u64>))` at RUSTLIB/core/src/ptr/mod.rs:LL:CC
    = note: inside `std::mem::drop::<std::sync::MutexGuard<'_, u64>>` at RUSTLIB/core/src/mem/mod.rs:LL:CC
 note: inside `miri_start`
-  --> tests/genmc/fail/intercept/mutex_double_unlock.rs:LL:CC
+  --> tests/genmc/fail/shims/mutex_double_unlock.rs:LL:CC
    |
 LL |     drop(guard);
    |     ^^^^^^^^^^^