mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-01 06:11:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Use crossbeam-channel instead of crossbeam (#11129)

Browse source
This commit is contained in:
Micha Reiser 2024-04-24 15:56:55 +02:00 • committed by GitHub
parent c9c2e7b978
commit 92814fd99b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 7 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Cargo.lock generated
View file

@ -495,19 +495,6 @@ dependencies = [
"itertools 0.10.5", "itertools 0.10.5",
] ]
[[package]]
name = "crossbeam"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-epoch",
"crossbeam-queue",
"crossbeam-utils",
]
[[package]] [[package]]
name = "crossbeam-channel" name = "crossbeam-channel"
version = "0.5.12" version = "0.5.12"
@ -536,15 +523,6 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "crossbeam-queue"
version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
dependencies = [
"crossbeam-utils",
]
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.8.19" version = "0.8.19"
@ -2255,7 +2233,7 @@ name = "ruff_server"
version = "0.2.2" version = "0.2.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"crossbeam", "crossbeam-channel",
"insta", "insta",
"jod-thread", "jod-thread",
"libc", "libc",

2
Cargo.toml
View file

@ -30,7 +30,7 @@ console_error_panic_hook = { version = "0.1.7" }
console_log = { version = "1.0.0" } console_log = { version = "1.0.0" }
countme = { version = "3.0.1" } countme = { version = "3.0.1" }
criterion = { version = "0.5.1", default-features = false } criterion = { version = "0.5.1", default-features = false }
crossbeam = { version = "0.8.4" } crossbeam-channel = { version = "0.5.12" }
dirs = { version = "5.0.0" } dirs = { version = "5.0.0" }
drop_bomb = { version = "0.1.5" } drop_bomb = { version = "0.1.5" }
env_logger = { version = "0.11.0" } env_logger = { version = "0.11.0" }

2
crates/ruff_server/Cargo.toml
View file

@ -26,7 +26,7 @@ ruff_text_size = { path = "../ruff_text_size" }
ruff_workspace = { path = "../ruff_workspace" } ruff_workspace = { path = "../ruff_workspace" }
anyhow = { workspace = true } anyhow = { workspace = true }
crossbeam = { workspace = true } crossbeam-channel = { workspace = true }
jod-thread = { workspace = true } jod-thread = { workspace = true }
libc = { workspace = true } libc = { workspace = true }
lsp-server = { workspace = true } lsp-server = { workspace = true }

2
crates/ruff_server/src/server/client.rs
View file

@ -6,7 +6,7 @@ use serde_json::Value;
use super::schedule::Task; 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>>; type ResponseBuilder<'s> = Box<dyn FnOnce(lsp_server::Response) -> Task<'s>>;

2
crates/ruff_server/src/server/schedule.rs
View file

@ -1,6 +1,6 @@
use std::num::NonZeroUsize; use std::num::NonZeroUsize;
use crossbeam::channel::Sender; use crossbeam_channel::Sender;
use crate::session::Session; use crate::session::Session;

4
crates/ruff_server/src/server/schedule/thread/pool.rs
View file

@ -21,7 +21,7 @@ use std::{
}, },
}; };
use crossbeam::channel::{Receiver, Sender}; use crossbeam_channel::{Receiver, Sender};
use super::{Builder, JoinHandle, ThreadPriority}; use super::{Builder, JoinHandle, ThreadPriority};
@ -52,7 +52,7 @@ impl Pool {
let threads = usize::from(threads); let threads = usize::from(threads);
// Channel buffer capacity is between 2 and 4, depending on the pool size. // 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 extant_tasks = Arc::new(AtomicUsize::new(0));
let mut handles = Vec::with_capacity(threads); let mut handles = Vec::with_capacity(threads);