Switch to standard scoped threads

.github/workflows/ci.yml

@@ -94,7 +94,7 @@ jobs:
           - macos-latest
         rust:
           - stable
-          - 1.38.0  # Minimum supported Rust version
+          - 1.63.0  # Minimum supported Rust version
 
     steps:
       - name: Checkout sources
@@ -148,7 +148,7 @@ jobs:
         rust:
           - beta
           - nightly
-          - 1.38.0  # Minimum supported Rust version (can be changed by deps)
+          - 1.63.0  # Minimum supported Rust version (can be changed by deps)
 
     steps:
       - name: Checkout sources

CHANGELOG.md

@@ -11,6 +11,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 _No unreleased changes in the pipeline at the moment._
 
 
+## [1.0.0] - 2022-08-15
+
+### Changed
+
+- Switch from crossbeam scoped threads to std scoped threads. This bumps our
+  `rustc` requirements all the way up to the latest release (v1.63), but has the
+  great advantage that we are no longer bound by the ever shifting rustc
+  requirements of crossbeam, so this requirement can stay indefinitely.
+
+
 ## [0.9.0] - 2022-08-10
 
 ### Changed
@@ -181,8 +191,9 @@ _No unreleased changes in the pipeline at the moment._
 
 
 
-[Unreleased]: https://github.com/HadrienG2/testbench/compare/v0.9.0...HEAD
-[0.8.1]: https://github.com/HadrienG2/testbench/compare/v0.8.1...v0.9.0
+[Unreleased]: https://github.com/HadrienG2/testbench/compare/v1.0.0...HEAD
+[1.0.0]: https://github.com/HadrienG2/testbench/compare/v0.9.0...v1.0.0
+[0.9.0]: https://github.com/HadrienG2/testbench/compare/v0.8.1...v0.9.0
 [0.8.1]: https://github.com/HadrienG2/testbench/compare/v0.8.0...v0.8.1
 [0.8.0]: https://github.com/HadrienG2/testbench/compare/v0.7.3...v0.8.0
 [0.7.3]: https://github.com/HadrienG2/testbench/compare/v0.7.2...v0.7.3

Cargo.toml

@@ -12,7 +12,7 @@ name = "testbench"
 # - Cargo publish.
 # - Add a github release
 #
-version = "0.9.0"
+version = "1.0.0"
 authors = ["Hadrien G. <knights_of_ni@gmx.com>"]
 description = "Testing and benchmarking tools for concurrent Rust code"
 documentation = "https://docs.rs/testbench/"
@@ -22,10 +22,7 @@ keywords = [ "testing", "benchmarking", "multithreading", "concurrent" ]
 categories = [ "concurrency", "development-tools" ]
 license = "MPL-2.0"
 edition = "2018"
-rust-version = "1.38.0"
+rust-version = "1.63.0"
 
 [badges]
 maintenance = { status = "passively-maintained" }
-
-[dependencies]
-crossbeam-utils = "0.8"

src/lib.rs

@@ -31,7 +31,6 @@
 pub mod noinline;
 pub mod race_cell;
 
-use crossbeam_utils::thread;
 use std::sync::{
     atomic::{AtomicBool, Ordering},
     Barrier,
@@ -55,15 +54,14 @@ use std::sync::{
 ///
 pub fn concurrent_test_2(f1: impl FnOnce() + Send, f2: impl FnOnce() + Send) {
     let barrier = Barrier::new(2);
-    thread::scope(|s| {
-        s.spawn(|_| {
+    std::thread::scope(|s| {
+        s.spawn(|| {
             barrier.wait();
             noinline::call_once(f1);
         });
         barrier.wait();
         noinline::call_once(f2);
     })
-    .expect("Failed to join thread running f1");
 }
 
 /// Test that running three operations concurrently works
@@ -82,19 +80,18 @@ pub fn concurrent_test_3(
     f3: impl FnOnce() + Send,
 ) {
     let barrier = Barrier::new(3);
-    thread::scope(|s| {
-        s.spawn(|_| {
+    std::thread::scope(|s| {
+        s.spawn(|| {
             barrier.wait();
             noinline::call_once(f1);
         });
-        s.spawn(|_| {
+        s.spawn(|| {
             barrier.wait();
             noinline::call_once(f2);
         });
         barrier.wait();
         noinline::call_once(f3);
     })
-    .expect("Failed to join threads running f1 and f2");
 }
 
 /// Perform some operation while another is running in a loop in another thread
@@ -126,8 +123,8 @@ pub fn run_under_contention<AntagonistResult, BenchmarkResult>(
 ) -> BenchmarkResult {
     let start_barrier = Barrier::new(2);
     let continue_flag = AtomicBool::new(true);
-    thread::scope(|s| {
-        s.spawn(|_| {
+    std::thread::scope(|s| {
+        s.spawn(|| {
             start_barrier.wait();
             while continue_flag.load(Ordering::Relaxed) {
                 antagonist();
@@ -138,7 +135,6 @@ pub fn run_under_contention<AntagonistResult, BenchmarkResult>(
         continue_flag.store(false, Ordering::Relaxed);
         result
     })
-    .expect("Failed to join antagonist thread")
 }
 
 /// Examples of concurrent testing code