Auto merge of #3762 - rust-lang:rustup-2024-07-25, r=saethlin

bors · bors · commit dee7e9d7e16f · 2024-07-25T05:21:19.000Z
Automatic Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-42103d69b73fb4e9d03d5cf66ec12985bb526f6e
+e7d66eac5e8e8f60370c98d186aee9fa0ebd7845
diff --git a/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr b/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr
@@ -10,7 +10,7 @@ LL |             assert_eq!(libc::pthread_mutex_lock(lock_copy.0.get() as *mut _
 error: deadlock: the evaluated program deadlocked
   --> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
    |
-LL |             let ret = libc::pthread_join(self.id, ptr::null_mut());
+LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |                                                                  ^ the evaluated program deadlocked
    |
    = note: BACKTRACE:
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
@@ -10,7 +10,7 @@ LL |             assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mu
 error: deadlock: the evaluated program deadlocked
   --> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
    |
-LL |             let ret = libc::pthread_join(self.id, ptr::null_mut());
+LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |                                                                  ^ the evaluated program deadlocked
    |
    = note: BACKTRACE:
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
@@ -10,7 +10,7 @@ LL |             assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mu
 error: deadlock: the evaluated program deadlocked
   --> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
    |
-LL |             let ret = libc::pthread_join(self.id, ptr::null_mut());
+LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
    |                                                                  ^ the evaluated program deadlocked
    |
    = note: BACKTRACE:

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-42103d69b73fb4e9d03d5cf66ec12985bb526f6e`
	`1`	`+e7d66eac5e8e8f60370c98d186aee9fa0ebd7845`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ LL \| assert_eq!(libc::pthread_mutex_lock(lock_copy.0.get() as *mut _`
`10`	`10`	`error: deadlock: the evaluated program deadlocked`
`11`	`11`	`--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC`
`12`	`12`	`\|`
`13`		`-LL \| let ret = libc::pthread_join(self.id, ptr::null_mut());`
	`13`	`+LL \| let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };`
`14`	`14`	`\| ^ the evaluated program deadlocked`
`15`	`15`	`\|`
`16`	`16`	`= note: BACKTRACE:`