diff --git a/Cargo.lock b/Cargo.lock index 907cfb5d68..8b11e3bcf7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1032,20 +1032,6 @@ dependencies = [ "itertools 0.9.0", ] -[[package]] -name = "crossbeam" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-channel", - "crossbeam-deque 0.8.0", - "crossbeam-epoch 0.9.3", - "crossbeam-queue", - "crossbeam-utils 0.8.3", -] - [[package]] name = "crossbeam-channel" version = "0.5.0" @@ -5815,8 +5801,8 @@ dependencies = [ "coreaudio-sys", "cpal", "criterion", - "crossbeam", "crossbeam-channel", + "crossbeam-utils 0.8.3", "directories-next", "dispatch 0.1.4", "dot_vox", diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index 9f949936bc..6bd924bd55 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -81,7 +81,8 @@ bincode = "1.3.1" chrono = { version = "0.4.9", features = ["serde"] } cpal = "0.13" copy_dir = "0.1.2" -crossbeam = "0.8.0" +crossbeam-utils = "0.8.1" +crossbeam-channel = "0.5" # TODO: remove directories-next = "2.0" dot_vox = "4.0" @@ -106,7 +107,6 @@ num_cpus = "1.0" # vec_map = { version = "0.8.2" } # inline_tweak = "1.0.2" itertools = "0.10.0" -crossbeam-channel = "0.5" # Tracy tracing = "0.1" diff --git a/voxygen/src/menu/main/client_init.rs b/voxygen/src/menu/main/client_init.rs index de69abc5a5..6c213ffc0b 100644 --- a/voxygen/src/menu/main/client_init.rs +++ b/voxygen/src/menu/main/client_init.rs @@ -4,7 +4,7 @@ use client::{ Client, ServerInfo, }; use common::consts::MIN_RECOMMENDED_TOKIO_THREADS; -use crossbeam::channel::{unbounded, Receiver, Sender, TryRecvError}; +use crossbeam_channel::{unbounded, Receiver, Sender, TryRecvError}; use std::{ sync::{ atomic::{AtomicBool, AtomicUsize, Ordering}, diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs index c148d5a9dd..e74ba048a2 100644 --- a/voxygen/src/scene/figure/cache.rs +++ b/voxygen/src/scene/figure/cache.rs @@ -25,7 +25,7 @@ use common::{ vol::BaseVol, }; use core::{hash::Hash, ops::Range}; -use crossbeam::atomic; +use crossbeam_utils::atomic; use hashbrown::{hash_map::Entry, HashMap}; use std::sync::Arc; use vek::*; diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs index 3713425bd5..65e34bde73 100644 --- a/voxygen/src/scene/terrain.rs +++ b/voxygen/src/scene/terrain.rs @@ -21,7 +21,7 @@ use common::{ }; use common_base::span; use core::{f32, fmt::Debug, i32, marker::PhantomData, time::Duration}; -use crossbeam::channel; +use crossbeam_channel as channel; use enum_iterator::IntoEnumIterator; use guillotiere::AtlasAllocator; use hashbrown::HashMap; diff --git a/voxygen/src/singleplayer.rs b/voxygen/src/singleplayer.rs index 25c5575482..cb9fd50f20 100644 --- a/voxygen/src/singleplayer.rs +++ b/voxygen/src/singleplayer.rs @@ -1,5 +1,5 @@ use common::{clock::Clock, consts::MIN_RECOMMENDED_TOKIO_THREADS}; -use crossbeam::channel::{bounded, unbounded, Receiver, Sender, TryRecvError}; +use crossbeam_channel::{bounded, unbounded, Receiver, Sender, TryRecvError}; use server::{ persistence::{DatabaseSettings, SqlLogMode}, Error as ServerError, Event, Input, Server, diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs index c4e37e9c61..06179e860a 100644 --- a/voxygen/src/window.rs +++ b/voxygen/src/window.rs @@ -5,7 +5,7 @@ use crate::{ ui, Error, }; use common_base::span; -use crossbeam::channel; +use crossbeam_channel as channel; use gilrs::{EventType, Gilrs}; use hashbrown::HashMap; use itertools::Itertools;