Merge pull request #4736 from rust-lang/rustup-2025-11-30

RalfJung · web-flow · commit b64f34c94e6b · 2025-11-30T10:10:40.000Z
Automatic Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-1eb0657f78777f0b4d6bcc49c126d5d35212cae5
+3ff30e7eafc1da7104c3960187d17939172428ed
diff --git a/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr b/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr
@@ -12,8 +12,8 @@ LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.rs:LL:CC
    |
diff --git a/tests/fail-dep/concurrency/libc_pthread_mutex_read_while_queued.rs b/tests/fail-dep/concurrency/libc_pthread_mutex_read_while_queued.rs
@@ -1,5 +1,5 @@
 //@ignore-target: windows # No pthreads on Windows
-//@compile-flags: -Zmiri-fixed-schedule
+//@compile-flags: -Zmiri-deterministic-concurrency
 
 use std::cell::UnsafeCell;
 use std::sync::atomic::*;
diff --git a/tests/fail-dep/concurrency/libc_pthread_mutex_write_while_queued.rs b/tests/fail-dep/concurrency/libc_pthread_mutex_write_while_queued.rs
@@ -1,5 +1,5 @@
 //@ignore-target: windows # No pthreads on Windows
-//@compile-flags: -Zmiri-fixed-schedule
+//@compile-flags: -Zmiri-deterministic-concurrency
 
 use std::cell::UnsafeCell;
 use std::sync::atomic::*;
diff --git a/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr b/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr
@@ -12,8 +12,8 @@ LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.rs:LL:CC
    |
diff --git a/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr b/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr
@@ -12,8 +12,8 @@ LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.rs:LL:CC
    |
diff --git a/tests/fail-dep/concurrency/windows_join_detached.stderr b/tests/fail-dep/concurrency/windows_join_detached.stderr
@@ -8,8 +8,8 @@ LL |         let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/concurrency/windows_join_detached.rs:LL:CC
    |
diff --git a/tests/fail-dep/concurrency/windows_join_main.stderr b/tests/fail-dep/concurrency/windows_join_main.stderr
@@ -14,8 +14,8 @@ LL |         let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/concurrency/windows_join_main.rs:LL:CC
    |
diff --git a/tests/fail-dep/concurrency/windows_join_self.stderr b/tests/fail-dep/concurrency/windows_join_self.stderr
@@ -12,8 +12,8 @@ LL |         let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/concurrency/windows_join_self.rs:LL:CC
    |
diff --git a/tests/fail-dep/libc/eventfd_block_read_twice.stderr b/tests/fail-dep/libc/eventfd_block_read_twice.stderr
@@ -6,8 +6,8 @@ LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/libc/eventfd_block_read_twice.rs:LL:CC
    |
diff --git a/tests/fail-dep/libc/eventfd_block_write_twice.stderr b/tests/fail-dep/libc/eventfd_block_write_twice.stderr
@@ -6,8 +6,8 @@ LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/libc/eventfd_block_write_twice.rs:LL:CC
    |
diff --git a/tests/fail-dep/libc/libc_epoll_block_two_thread.stderr b/tests/fail-dep/libc/libc_epoll_block_two_thread.stderr
@@ -6,8 +6,8 @@ LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/libc/libc_epoll_block_two_thread.rs:LL:CC
    |
diff --git a/tests/fail-dep/libc/socketpair-close-while-blocked.stderr b/tests/fail-dep/libc/socketpair-close-while-blocked.stderr
@@ -6,8 +6,8 @@ LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/libc/socketpair-close-while-blocked.rs:LL:CC
    |
diff --git a/tests/fail-dep/libc/socketpair_block_read_twice.stderr b/tests/fail-dep/libc/socketpair_block_read_twice.stderr
@@ -6,8 +6,8 @@ LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/libc/socketpair_block_read_twice.rs:LL:CC
    |
diff --git a/tests/fail-dep/libc/socketpair_block_write_twice.stderr b/tests/fail-dep/libc/socketpair_block_write_twice.stderr
@@ -6,8 +6,8 @@ LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.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 `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
+   = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
 note: inside `main`
   --> tests/fail-dep/libc/socketpair_block_write_twice.rs:LL:CC
    |
diff --git a/tests/genmc/fail/shims/mutex_diff_thread_unlock.stderr b/tests/genmc/fail/shims/mutex_diff_thread_unlock.stderr
@@ -18,7 +18,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    = note: inside `std::sys::env::PLATFORM::getenv` at RUSTLIB/std/src/sys/env/PLATFORM.rs:LL:CC
    = note: inside `std::env::_var_os` at RUSTLIB/std/src/env.rs:LL:CC
    = 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 closure at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
 note: inside `miri_start`
   --> tests/genmc/fail/shims/mutex_diff_thread_unlock.rs:LL:CC
    |
@@ -48,7 +48,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    = note: inside `std::sys::env::PLATFORM::getenv` at RUSTLIB/std/src/sys/env/PLATFORM.rs:LL:CC
    = note: inside `std::env::_var_os` at RUSTLIB/std/src/env.rs:LL:CC
    = 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 closure at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
 note: inside `miri_start`
   --> tests/genmc/fail/shims/mutex_diff_thread_unlock.rs:LL:CC
    |
diff --git a/tests/genmc/pass/std/arc.check_count.stderr b/tests/genmc/pass/std/arc.check_count.stderr
@@ -1,6 +1,6 @@
 Running GenMC Verification...
 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
+  --> RUSTLIB/std/src/thread/id.rs:LL:CC
    |
 LL |                     match COUNTER.compare_exchange_weak(last, id, Ordering::Relaxed, Ordering::Relaxed) {
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GenMC might miss possible behaviors of this code
@@ -46,7 +46,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    |
    = note: BACKTRACE:
    = note: inside closure at RUSTLIB/std/src/sys/env/PLATFORM.rs:LL:CC
-   = note: inside closure at RUSTLIB/std/src/thread/mod.rs:LL:CC
+   = note: inside closure at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
 note: inside `main`
   --> tests/genmc/pass/std/arc.rs:LL:CC
    |
@@ -67,7 +67,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    |
    = note: BACKTRACE:
    = note: inside closure at RUSTLIB/std/src/sys/env/PLATFORM.rs:LL:CC
-   = note: inside closure at RUSTLIB/std/src/thread/mod.rs:LL:CC
+   = note: inside closure at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
 note: inside `main`
   --> tests/genmc/pass/std/arc.rs:LL:CC
    |
diff --git a/tests/genmc/pass/std/arc.try_upgrade.stderr b/tests/genmc/pass/std/arc.try_upgrade.stderr
@@ -1,6 +1,6 @@
 Running GenMC Verification...
 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
+  --> RUSTLIB/std/src/thread/id.rs:LL:CC
    |
 LL |                     match COUNTER.compare_exchange_weak(last, id, Ordering::Relaxed, Ordering::Relaxed) {
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GenMC might miss possible behaviors of this code
@@ -46,7 +46,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    |
    = note: BACKTRACE:
    = note: inside closure at RUSTLIB/std/src/sys/env/PLATFORM.rs:LL:CC
-   = note: inside closure at RUSTLIB/std/src/thread/mod.rs:LL:CC
+   = note: inside closure at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
 note: inside `main`
   --> tests/genmc/pass/std/arc.rs:LL:CC
    |
@@ -67,7 +67,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    |
    = note: BACKTRACE:
    = note: inside closure at RUSTLIB/std/src/sys/env/PLATFORM.rs:LL:CC
-   = note: inside closure at RUSTLIB/std/src/thread/mod.rs:LL:CC
+   = note: inside closure at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
 note: inside `main`
   --> tests/genmc/pass/std/arc.rs:LL:CC
    |
diff --git a/tests/genmc/pass/std/empty_main.stderr b/tests/genmc/pass/std/empty_main.stderr
@@ -1,6 +1,6 @@
 Running GenMC Verification...
 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
+  --> RUSTLIB/std/src/thread/id.rs:LL:CC
    |
 LL |                     match COUNTER.compare_exchange_weak(last, id, Ordering::Relaxed, Ordering::Relaxed) {
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GenMC might miss possible behaviors of this code
diff --git a/tests/genmc/pass/std/spawn_std_threads.stderr b/tests/genmc/pass/std/spawn_std_threads.stderr
@@ -1,6 +1,6 @@
 Running GenMC Verification...
 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
+  --> RUSTLIB/std/src/thread/id.rs:LL:CC
    |
 LL |                     match COUNTER.compare_exchange_weak(last, id, Ordering::Relaxed, Ordering::Relaxed) {
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GenMC might miss possible behaviors of this code
@@ -20,7 +20,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    |
    = note: BACKTRACE:
    = note: inside closure at RUSTLIB/std/src/sys/env/PLATFORM.rs:LL:CC
-   = note: inside closure at RUSTLIB/std/src/thread/mod.rs:LL:CC
+   = note: inside closure at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
 note: inside closure
   --> tests/genmc/pass/std/spawn_std_threads.rs:LL:CC
    |
@@ -52,7 +52,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    |
    = note: BACKTRACE:
    = note: inside closure at RUSTLIB/std/src/sys/env/PLATFORM.rs:LL:CC
-   = note: inside closure at RUSTLIB/std/src/thread/mod.rs:LL:CC
+   = note: inside closure at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
 note: inside closure
   --> tests/genmc/pass/std/spawn_std_threads.rs:LL:CC
    |
diff --git a/tests/genmc/pass/std/thread_locals.stderr b/tests/genmc/pass/std/thread_locals.stderr
@@ -1,6 +1,6 @@
 Running GenMC Verification...
 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
+  --> RUSTLIB/std/src/thread/id.rs:LL:CC
    |
 LL |                     match COUNTER.compare_exchange_weak(last, id, Ordering::Relaxed, Ordering::Relaxed) {
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GenMC might miss possible behaviors of this code
@@ -20,7 +20,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    |
    = note: BACKTRACE:
    = note: inside closure at RUSTLIB/std/src/sys/env/PLATFORM.rs:LL:CC
-   = note: inside closure at RUSTLIB/std/src/thread/mod.rs:LL:CC
+   = note: inside closure at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
 note: inside `main`
   --> tests/genmc/pass/std/thread_locals.rs:LL:CC
    |
@@ -42,7 +42,7 @@ LL | |                 .compare_exchange_weak(state, state + READ_LOCKED, Acquir
    |
    = note: BACKTRACE:
    = note: inside closure at RUSTLIB/std/src/sys/env/PLATFORM.rs:LL:CC
-   = note: inside closure at RUSTLIB/std/src/thread/mod.rs:LL:CC
+   = note: inside closure at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
 note: inside `main`
   --> tests/genmc/pass/std/thread_locals.rs:LL:CC
    |

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-1eb0657f78777f0b4d6bcc49c126d5d35212cae5`
	`1`	`+3ff30e7eafc1da7104c3960187d17939172428ed`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ LL \| let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };`
`12`	`12`	`\|`
`13`	`13`	`= note: BACKTRACE:`
`14`	`14`	= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
`15`		- = note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
`16`		- = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
	`15`	+ = note: inside `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
	`16`	+ = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
`17`	`17`	note: inside `main`
`18`	`18`	`--> tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.rs:LL:CC`
`19`	`19`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ LL \| let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(`
`14`	`14`	`\|`
`15`	`15`	`= note: BACKTRACE:`
`16`	`16`	= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
`17`		- = note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
`18`		- = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
	`17`	+ = note: inside `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
	`18`	+ = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
`19`	`19`	note: inside `main`
`20`	`20`	`--> tests/fail-dep/concurrency/windows_join_main.rs:LL:CC`
`21`	`21`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ LL \| let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(`
`12`	`12`	`\|`
`13`	`13`	`= note: BACKTRACE:`
`14`	`14`	= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
`15`		- = note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
`16`		- = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
	`15`	+ = note: inside `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
	`16`	+ = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
`17`	`17`	note: inside `main`
`18`	`18`	`--> tests/fail-dep/concurrency/windows_join_self.rs:LL:CC`
`19`	`19`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ LL \| let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };`
`6`	`6`	`\|`
`7`	`7`	`= note: BACKTRACE:`
`8`	`8`	= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
`9`		- = note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
`10`		- = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
	`9`	+ = note: inside `std::thread::lifecycle::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/lifecycle.rs:LL:CC
	`10`	+ = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/join_handle.rs:LL:CC
`11`	`11`	note: inside `main`
`12`	`12`	`--> tests/fail-dep/libc/eventfd_block_read_twice.rs:LL:CC`
`13`	`13`	`\|`