dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #106635 - RalfJung:std-test-nits, r=thomcc 

std sync tests: better type name, clarifying comment

Just resolving some confusion that I encountered while reading these tests.

r? `@thomcc`
This commit is contained in:
Yuki Okushi 2023-01-11 14:18:54 +09:00 committed by GitHub
parent b0ffc113a4 997101824b
commit 397013dc44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/std/src/sync/mutex/tests.rs
View File

@ -181,7 +181,7 @@ fn test_mutex_arc_poison() {
let arc2 = arc.clone(); let arc2 = arc.clone();
let _ = thread::spawn(move || { let _ = thread::spawn(move || {
let lock = arc2.lock().unwrap(); let lock = arc2.lock().unwrap();
assert_eq!(*lock, 2); assert_eq!(*lock, 2); // deliberate assertion failure to poison the mutex
}) })
.join(); .join();
assert!(arc.lock().is_err()); assert!(arc.lock().is_err());

22
library/std/src/thread/local/tests.rs
View File

@ -23,11 +23,11 @@ impl Signal {
} }
} }
struct Foo(Signal); struct NotifyOnDrop(Signal);
impl Drop for Foo { impl Drop for NotifyOnDrop {
fn drop(&mut self) { fn drop(&mut self) {
let Foo(ref f) = *self; let NotifyOnDrop(ref f) = *self;
f.notify(); f.notify();
} }
} }
@ -82,18 +82,18 @@ fn states() {
#[test] #[test]
fn smoke_dtor() { fn smoke_dtor() {
thread_local!(static FOO: UnsafeCell<Option<Foo>> = UnsafeCell::new(None)); thread_local!(static FOO: UnsafeCell<Option<NotifyOnDrop>> = UnsafeCell::new(None));
run(&FOO); run(&FOO);
thread_local!(static FOO2: UnsafeCell<Option<Foo>> = const { UnsafeCell::new(None) }); thread_local!(static FOO2: UnsafeCell<Option<NotifyOnDrop>> = const { UnsafeCell::new(None) });
run(&FOO2); run(&FOO2);
fn run(key: &'static LocalKey<UnsafeCell<Option<Foo>>>) { fn run(key: &'static LocalKey<UnsafeCell<Option<NotifyOnDrop>>>) {
let signal = Signal::default(); let signal = Signal::default();
let signal2 = signal.clone(); let signal2 = signal.clone();
let t = thread::spawn(move || unsafe { let t = thread::spawn(move || unsafe {
let mut signal = Some(signal2); let mut signal = Some(signal2);
key.with(|f| { key.with(|f| {
*f.get() = Some(Foo(signal.take().unwrap())); *f.get() = Some(NotifyOnDrop(signal.take().unwrap()));
}); });
}); });
signal.wait(); signal.wait();
@ -187,13 +187,13 @@ fn self_referential() {
fn dtors_in_dtors_in_dtors() { fn dtors_in_dtors_in_dtors() {
struct S1(Signal); struct S1(Signal);
thread_local!(static K1: UnsafeCell<Option<S1>> = UnsafeCell::new(None)); thread_local!(static K1: UnsafeCell<Option<S1>> = UnsafeCell::new(None));
thread_local!(static K2: UnsafeCell<Option<Foo>> = UnsafeCell::new(None)); thread_local!(static K2: UnsafeCell<Option<NotifyOnDrop>> = UnsafeCell::new(None));
impl Drop for S1 { impl Drop for S1 {
fn drop(&mut self) { fn drop(&mut self) {
let S1(ref signal) = *self; let S1(ref signal) = *self;
unsafe { unsafe {
let _ = K2.try_with(|s| *s.get() = Some(Foo(signal.clone()))); let _ = K2.try_with(|s| *s.get() = Some(NotifyOnDrop(signal.clone())));
} }
} }
} }
@ -211,13 +211,13 @@ fn dtors_in_dtors_in_dtors() {
fn dtors_in_dtors_in_dtors_const_init() { fn dtors_in_dtors_in_dtors_const_init() {
struct S1(Signal); struct S1(Signal);
thread_local!(static K1: UnsafeCell<Option<S1>> = const { UnsafeCell::new(None) }); thread_local!(static K1: UnsafeCell<Option<S1>> = const { UnsafeCell::new(None) });
thread_local!(static K2: UnsafeCell<Option<Foo>> = const { UnsafeCell::new(None) }); thread_local!(static K2: UnsafeCell<Option<NotifyOnDrop>> = const { UnsafeCell::new(None) });
impl Drop for S1 { impl Drop for S1 {
fn drop(&mut self) { fn drop(&mut self) {
let S1(ref signal) = *self; let S1(ref signal) = *self;
unsafe { unsafe {
let _ = K2.try_with(|s| *s.get() = Some(Foo(signal.clone()))); let _ = K2.try_with(|s| *s.get() = Some(NotifyOnDrop(signal.clone())));
} }
} }
} }