Merge #239

239: switch to thread::scope in tests r=matklad a=matklad bors r+ Co-authored-by: Alex Kladov <aleksey.kladov@gmail.com>
matklad · Jun 4, 2023 · c7e7096 · c7e7096
2 parents 67f5856 + d810058
commit c7e7096
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 163 deletions.
diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,8 +25,6 @@ atomic-polyfill = { version = "1", optional = true }
 critical-section = { version = "1", optional = true }
 
 [dev-dependencies]
-lazy_static = "1.0.0"
-crossbeam-utils = "0.8.7"
 regex =  "1.2.0"
 critical-section = { version = "1.1.1", features = ["std"] }
 
@@ -67,10 +65,6 @@ required-features = ["std"]
 name = "bench_acquire"
 required-features = ["std"]
 
-[[example]]
-name = "bench_vs_lazy_static"
-required-features = ["std"]
-
 [[example]]
 name = "lazy_static"
 required-features = ["std"]

diff --git a/examples/bench_vs_lazy_static.rs b/examples/bench_vs_lazy_static.rs
diff --git a/tests/it/race.rs b/tests/it/race.rs
@@ -3,10 +3,9 @@ use std::sync::Barrier;
 use std::{
     num::NonZeroUsize,
     sync::atomic::{AtomicUsize, Ordering::SeqCst},
+    thread::scope,
 };
 
-use crossbeam_utils::thread::scope;
-
 use once_cell::race::{OnceBool, OnceNonZeroUsize};
 
 #[test]
@@ -15,7 +14,7 @@ fn once_non_zero_usize_smoke_test() {
     let cell = OnceNonZeroUsize::new();
     let val = NonZeroUsize::new(92).unwrap();
     scope(|s| {
-        s.spawn(|_| {
+        s.spawn(|| {
             assert_eq!(
                 cell.get_or_init(|| {
                     cnt.fetch_add(1, SeqCst);
@@ -34,8 +33,7 @@ fn once_non_zero_usize_smoke_test() {
             );
             assert_eq!(cnt.load(SeqCst), 1);
         });
-    })
-    .unwrap();
+    });
     assert_eq!(cell.get(), Some(val));
     assert_eq!(cnt.load(SeqCst), 1);
 }
@@ -66,7 +64,7 @@ fn once_non_zero_usize_first_wins() {
     let b2 = Barrier::new(2);
     let b3 = Barrier::new(2);
     scope(|s| {
-        s.spawn(|_| {
+        s.spawn(|| {
             let r1 = cell.get_or_init(|| {
                 b1.wait();
                 b2.wait();
@@ -76,16 +74,15 @@ fn once_non_zero_usize_first_wins() {
             b3.wait();
         });
         b1.wait();
-        s.spawn(|_| {
+        s.spawn(|| {
             let r2 = cell.get_or_init(|| {
                 b2.wait();
                 b3.wait();
                 val2
             });
             assert_eq!(r2, val1);
         });
-    })
-    .unwrap();
+    });
 
     assert_eq!(cell.get(), Some(val1));
 }
@@ -95,7 +92,7 @@ fn once_bool_smoke_test() {
     let cnt = AtomicUsize::new(0);
     let cell = OnceBool::new();
     scope(|s| {
-        s.spawn(|_| {
+        s.spawn(|| {
             assert_eq!(
                 cell.get_or_init(|| {
                     cnt.fetch_add(1, SeqCst);
@@ -114,8 +111,7 @@ fn once_bool_smoke_test() {
             );
             assert_eq!(cnt.load(SeqCst), 1);
         });
-    })
-    .unwrap();
+    });
     assert_eq!(cell.get(), Some(false));
     assert_eq!(cnt.load(SeqCst), 1);
 }