Skip to content

Commit 8d76ba6

Browse files
committed
Auto merge of #128142 - matthiaskrgr:rollup-rep8ofv, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #126152 (size_of_val_raw: for length 0 this is safe to call) - #127252 (Add edge-case examples to `{count,leading,trailing}_{ones,zeros}` methods) - #127374 (Tweak "wrong # of generics" suggestions) - #127457 (Make tidy fast without compromising case alternation) - #127480 (Fix build failure on vxworks #127084 ) - #127733 (Replace some `mem::forget`'s with `ManuallyDrop`) - #128120 (Gate `AsyncFn*` under `async_closure` feature) - #128131 (Import `c_void` rather than using the full path) - #128133 (Improve spans on evaluated `cfg_attr`s.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents d76c60c + bb5705f commit 8d76ba6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | assert_eq!(libc::pthread_mutex_lock(lock_copy.0.get() as *mut _
1010
error: deadlock: the evaluated program deadlocked
1111
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
1212
|
13-
LL | let ret = libc::pthread_join(self.id, ptr::null_mut());
13+
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
1414
| ^ the evaluated program deadlocked
1515
|
1616
= note: BACKTRACE:

tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mu
1010
error: deadlock: the evaluated program deadlocked
1111
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
1212
|
13-
LL | let ret = libc::pthread_join(self.id, ptr::null_mut());
13+
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
1414
| ^ the evaluated program deadlocked
1515
|
1616
= note: BACKTRACE:

tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mu
1010
error: deadlock: the evaluated program deadlocked
1111
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
1212
|
13-
LL | let ret = libc::pthread_join(self.id, ptr::null_mut());
13+
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
1414
| ^ the evaluated program deadlocked
1515
|
1616
= note: BACKTRACE:

0 commit comments

Comments
 (0)