Skip to content

Replace crossbeam channel with std::sync::mpsc #861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebcrozet merged 2 commits into from
Jul 24, 2025
Merged

Replace crossbeam channel with std::sync::mpsc #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e907b4
Replace crossbeam channel with std::sync::mpsc
namse Jul 18, 2025
eb8efe1
Update mod.rs
namse Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion crates/rapier2d-f64/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ parry2d-f64 = "0.22.0-beta.1"
simba = "0.9"
approx = "0.5"
rayon = { version = "1", optional = true }
crossbeam = "0.8"
arrayvec = "0.7"
bit-vec = "0.8"
rustc-hash = "2"
Expand Down
1 change: 0 additions & 1 deletion crates/rapier2d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ parry2d = "0.22.0-beta.1"
simba = "0.9"
approx = "0.5"
rayon = { version = "1", optional = true }
crossbeam = "0.8"
arrayvec = "0.7"
bit-vec = "0.8"
rustc-hash = "2"
Expand Down
1 change: 0 additions & 1 deletion crates/rapier3d-f64/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ parry3d-f64 = "0.22.0-beta.1"
simba = "0.9"
approx = "0.5"
rayon = { version = "1", optional = true }
crossbeam = "0.8"
arrayvec = "0.7"
bit-vec = "0.8"
rustc-hash = "2"
Expand Down
1 change: 0 additions & 1 deletion crates/rapier3d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ parry3d = "0.22.0-beta.1"
simba = "0.9"
approx = "0.5"
rayon = { version = "1", optional = true }
crossbeam = "0.8"
arrayvec = "0.7"
bit-vec = "0.8"
rustc-hash = "2"
Expand Down
1 change: 0 additions & 1 deletion crates/rapier_testbed2d-f64/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ web-time = { version = "1.1" }
bitflags = "2"
num_cpus = { version = "1", optional = true }
wrapped2d = { version = "0.4", optional = true }
crossbeam = "0.8"
bincode = "1"
Inflector = "0.11"
md5 = "0.7"
Expand Down
1 change: 0 additions & 1 deletion crates/rapier_testbed2d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ web-time = { version = "1.1" }
bitflags = "2"
num_cpus = { version = "1", optional = true }
wrapped2d = { version = "0.4", optional = true }
crossbeam = "0.8"
bincode = "1"
Inflector = "0.11"
md5 = "0.7"
Expand Down
1 change: 0 additions & 1 deletion crates/rapier_testbed3d-f64/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ rand_pcg = "0.3"
web-time = { version = "1.1" }
bitflags = "2"
num_cpus = { version = "1", optional = true }
crossbeam = "0.8"
bincode = "1"
md5 = "0.7"
Inflector = "0.11"
Expand Down
1 change: 0 additions & 1 deletion crates/rapier_testbed3d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ glam = { version = "0.27", optional = true } # For Physx
num_cpus = { version = "1", optional = true }
physx = { version = "0.19", features = ["glam"], optional = true }
physx-sys = { version = "0.11", optional = true }
crossbeam = "0.8"
bincode = "1"
md5 = "0.7"
Inflector = "0.11"
Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ pub extern crate parry3d as parry;
#[cfg(all(feature = "dim3", feature = "f64"))]
pub extern crate parry3d_f64 as parry;

pub extern crate crossbeam;
pub extern crate nalgebra as na;
#[cfg(feature = "serde-serialize")]
#[macro_use]
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/event_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::dynamics::RigidBodySet;
use crate::geometry::{ColliderSet, CollisionEvent, ContactForceEvent, ContactPair};
use crate::math::Real;
use crossbeam::channel::Sender;
use std::sync::mpsc::Sender;

bitflags::bitflags! {
#[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))]
Expand Down Expand Up @@ -90,14 +90,14 @@ impl EventHandler for () {
}
}

/// A collision event handler that collects events into a crossbeam channel.
/// A collision event handler that collects events into a channel.
pub struct ChannelEventCollector {
collision_event_sender: Sender<CollisionEvent>,
contact_force_event_sender: Sender<ContactForceEvent>,
}

impl ChannelEventCollector {
/// Initialize a new collision event handler from crossbeam channel senders.
/// Initialize a new collision event handler from channel senders.
pub fn new(
collision_event_sender: Sender<CollisionEvent>,
contact_force_event_sender: Sender<ContactForceEvent>,
Expand Down
4 changes: 2 additions & 2 deletions src_testbed/harness/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ type Callbacks =
#[allow(dead_code)]
impl Harness {
pub fn new_empty() -> Self {
let collision_event_channel = crossbeam::channel::unbounded();
let contact_force_event_channel = crossbeam::channel::unbounded();
let collision_event_channel = std::sync::mpsc::channel();
let contact_force_event_channel = std::sync::mpsc::channel();
let event_handler =
ChannelEventCollector::new(collision_event_channel.0, contact_force_event_channel.0);
let events = PhysicsEvents {
Expand Down
2 changes: 1 addition & 1 deletion src_testbed/physics/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use crossbeam::channel::Receiver;
use rapier::dynamics::{
CCDSolver, ImpulseJointSet, IntegrationParameters, IslandManager, MultibodyJointSet,
RigidBodySet,
Expand All @@ -8,6 +7,7 @@ use rapier::geometry::{
};
use rapier::math::{Real, Vector};
use rapier::pipeline::{PhysicsHooks, PhysicsPipeline};
use std::sync::mpsc::Receiver;

pub struct PhysicsSnapshot {
timestep_id: usize,
Expand Down