remove dependency on crossbeam crate and use its dependencies instead

Author: m4rch3n1ng

Cargo.lock

@@ -73,7 +73,8 @@ parking_lot = { version = "0.12", features = ["arc_lock", "send_guard"] }
 bigdecimal = "0.4.5"
 
 # Also for sync stuff
-crossbeam = "0.8.4"
+crossbeam-channel = "0.5.14"
+crossbeam-utils = "0.8.21"
 
 httparse = "1.9.4"
 

crates/steel-core/Cargo.toml

@@ -1068,13 +1068,13 @@ impl<'a> BreadthFirstSearchSteelValVisitor for IterativeDropHandler<'a> {
                 self.moved_threads = true;
 
                 static DROP_THREAD: std::sync::LazyLock<
-                    crossbeam::channel::Sender<OwnedIterativeDropHandler>,
+                    crossbeam_channel::Sender<OwnedIterativeDropHandler>,
                 > = std::sync::LazyLock::new(start_background_drop_thread);
 
                 fn start_background_drop_thread(
-                ) -> crossbeam::channel::Sender<OwnedIterativeDropHandler> {
+                ) -> crossbeam_channel::Sender<OwnedIterativeDropHandler> {
                     let (sender, receiver) =
-                        crossbeam::channel::unbounded::<OwnedIterativeDropHandler>();
+                        crossbeam_channel::unbounded::<OwnedIterativeDropHandler>();
 
                     std::thread::spawn(move || {
                         while let Ok(mut value) = receiver.recv() {

crates/steel-core/src/rvals/cycles.rs

@@ -59,7 +59,7 @@ use std::{cell::RefCell, collections::HashMap, iter::Iterator, rc::Rc};
 
 use super::engine::EngineId;
 
-use crossbeam::atomic::AtomicCell;
+use crossbeam_utils::atomic::AtomicCell;
 #[cfg(feature = "profiling")]
 use log::{debug, log_enabled};
 use num_bigint::BigInt;

crates/steel-core/src/steel_vm/vm.rs

@@ -548,11 +548,11 @@ fn spawn_thread_result(ctx: &mut VmCore, args: &[SteelVal]) -> Result<SteelVal>
 }
 
 pub struct SteelReceiver {
-    receiver: crossbeam::channel::Receiver<SteelVal>,
+    receiver: crossbeam_channel::Receiver<SteelVal>,
 }
 
 pub struct SteelSender {
-    sender: crossbeam::channel::Sender<SteelVal>,
+    sender: crossbeam_channel::Sender<SteelVal>,
 }
 
 pub struct Channels {
@@ -566,7 +566,7 @@ impl Custom for Channels {}
 
 impl Channels {
     pub fn new() -> Self {
-        let (sender, receiver) = crossbeam::channel::unbounded();
+        let (sender, receiver) = crossbeam_channel::unbounded();
 
         Self {
             sender: SteelSender { sender }.into_steelval().unwrap(),
@@ -589,7 +589,7 @@ impl Channels {
 /// Using this directly is not recommended.
 #[steel_derive::native(name = "receivers-select", arity = "AtLeast(0)")]
 pub fn select(values: &[SteelVal]) -> Result<SteelVal> {
-    let mut selector = crossbeam::channel::Select::new();
+    let mut selector = crossbeam_channel::Select::new();
 
     let borrows = values
         .iter()
@@ -650,8 +650,8 @@ pub fn channel_try_recv(receiver: &SteelVal) -> Result<SteelVal> {
 
     match value {
         Ok(v) => Ok(v),
-        Err(crossbeam::channel::TryRecvError::Empty) => Ok(empty_channel()),
-        Err(crossbeam::channel::TryRecvError::Disconnected) => Ok(disconnected_channel()),
+        Err(crossbeam_channel::TryRecvError::Empty) => Ok(empty_channel()),
+        Err(crossbeam_channel::TryRecvError::Disconnected) => Ok(disconnected_channel()),
     }
 }
 

crates/steel-core/src/steel_vm/vm/threads.rs

@@ -15,7 +15,7 @@ steel-core = { workspace = true }
 steel-parser = { path = "../steel-parser", version = "0.6.0"}
 home = "0.5.9"
 ctrlc = "3.4.4"
-crossbeam = "0.8.4"
+crossbeam-utils = "0.8.21"
 owo-colors = "4.2.0"
 
 [features]

crates/steel-repl/Cargo.toml

@@ -23,14 +23,14 @@ use std::borrow::Cow;
 #[derive(Helper)]
 pub struct RustylineHelper {
     globals: Arc<Mutex<HashSet<InternedString>>>,
-    bracket: crossbeam::atomic::AtomicCell<Option<(u8, usize)>>, // keywords: HashSet<&'static str>,
+    bracket: crossbeam_utils::atomic::AtomicCell<Option<(u8, usize)>>, // keywords: HashSet<&'static str>,
 }
 
 impl RustylineHelper {
     pub fn new(globals: Arc<Mutex<HashSet<InternedString>>>) -> Self {
         Self {
             globals,
-            bracket: crossbeam::atomic::AtomicCell::new(None),
+            bracket: crossbeam_utils::atomic::AtomicCell::new(None),
         }
     }
 }

crates/steel-repl/src/highlight.rs

@@ -13,6 +13,6 @@ crate-type = ["cdylib"]
 steel-core = { workspace = true }
 axum = { version = "0.6.2", features = ["query"] }
 tokio = { version = "1.0", features = ["full"] }
-crossbeam = "0.8.2"
+crossbeam-channel = "0.5.14"
 serde_json = "1.0.92"
 abi_stable = "0.11.1"

libs/steel-webserver/Cargo.toml

@@ -8,7 +8,7 @@ use steel::{
     },
 };
 
-use crossbeam::channel::{unbounded, Receiver, Sender};
+use crossbeam_channel::{unbounded, Receiver, Sender};
 
 use axum::extract::Path;