Skip to content

Commit

Permalink
Use crossbeam-channel instead of crossbeam (#11129)
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaReiser committed Apr 24, 2024
1 parent c9c2e7b commit 92814fd
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 29 deletions.
24 changes: 1 addition & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ console_error_panic_hook = { version = "0.1.7" }
console_log = { version = "1.0.0" }
countme = { version = "3.0.1" }
criterion = { version = "0.5.1", default-features = false }
crossbeam = { version = "0.8.4" }
crossbeam-channel = { version = "0.5.12" }
dirs = { version = "5.0.0" }
drop_bomb = { version = "0.1.5" }
env_logger = { version = "0.11.0" }
Expand Down
2 changes: 1 addition & 1 deletion crates/ruff_server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ruff_text_size = { path = "../ruff_text_size" }
ruff_workspace = { path = "../ruff_workspace" }

anyhow = { workspace = true }
crossbeam = { workspace = true }
crossbeam-channel = { workspace = true }
jod-thread = { workspace = true }
libc = { workspace = true }
lsp-server = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/ruff_server/src/server/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use serde_json::Value;

use super::schedule::Task;

pub(crate) type ClientSender = crossbeam::channel::Sender<lsp_server::Message>;
pub(crate) type ClientSender = crossbeam_channel::Sender<lsp_server::Message>;

type ResponseBuilder<'s> = Box<dyn FnOnce(lsp_server::Response) -> Task<'s>>;

Expand Down
2 changes: 1 addition & 1 deletion crates/ruff_server/src/server/schedule.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::num::NonZeroUsize;

use crossbeam::channel::Sender;
use crossbeam_channel::Sender;

use crate::session::Session;

Expand Down
4 changes: 2 additions & 2 deletions crates/ruff_server/src/server/schedule/thread/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::{
},
};

use crossbeam::channel::{Receiver, Sender};
use crossbeam_channel::{Receiver, Sender};

use super::{Builder, JoinHandle, ThreadPriority};

Expand Down Expand Up @@ -52,7 +52,7 @@ impl Pool {
let threads = usize::from(threads);

// Channel buffer capacity is between 2 and 4, depending on the pool size.
let (job_sender, job_receiver) = crossbeam::channel::bounded(std::cmp::min(threads * 2, 4));
let (job_sender, job_receiver) = crossbeam_channel::bounded(std::cmp::min(threads * 2, 4));
let extant_tasks = Arc::new(AtomicUsize::new(0));

let mut handles = Vec::with_capacity(threads);
Expand Down

0 comments on commit 92814fd

Please sign in to comment.