Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove num-cpus dependency (#11240)

This commit is contained in:
Micha Reiser 2024-05-02 22:30:48 +02:00 committed by GitHub
parent 9a1f6f6762
commit 7cec3b2623
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Cargo.lock generated
View File

@ -1457,16 +1457,6 @@ dependencies = [
"autocfg", "autocfg",
] ]
[[package]]
name = "num_cpus"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
"hermit-abi",
"libc",
]
[[package]] [[package]]
name = "number_prefix" name = "number_prefix"
version = "0.4.0" version = "0.4.0"
@ -1974,7 +1964,6 @@ dependencies = [
"log", "log",
"mimalloc", "mimalloc",
"notify", "notify",
"num_cpus",
"path-absolutize", "path-absolutize",
"rayon", "rayon",
"regex", "regex",

1
Cargo.toml
View File

@ -66,7 +66,6 @@ memchr = { version = "2.7.1" }
mimalloc = { version = "0.1.39" } mimalloc = { version = "0.1.39" }
natord = { version = "1.0.9" } natord = { version = "1.0.9" }
notify = { version = "6.1.1" } notify = { version = "6.1.1" }
num_cpus = { version = "1.16.0" }
once_cell = { version = "1.19.0" } once_cell = { version = "1.19.0" }
path-absolutize = { version = "3.1.1" } path-absolutize = { version = "3.1.1" }
path-slash = { version = "0.2.1" } path-slash = { version = "0.2.1" }

1
crates/ruff/Cargo.toml
View File

@ -41,7 +41,6 @@ is-macro = { workspace = true }
itertools = { workspace = true } itertools = { workspace = true }
log = { workspace = true } log = { workspace = true }
notify = { workspace = true } notify = { workspace = true }
num_cpus = { workspace = true }
path-absolutize = { workspace = true, features = ["once_cell_cache"] } path-absolutize = { workspace = true, features = ["once_cell_cache"] }
rayon = { workspace = true } rayon = { workspace = true }
regex = { workspace = true } regex = { workspace = true }

13
crates/ruff/src/lib.rs
View File

@ -214,13 +214,14 @@ fn format(args: FormatCommand, global_options: GlobalConfigArgs) -> Result<ExitS
fn server(args: ServerCommand, log_level: LogLevel) -> Result<ExitStatus> { fn server(args: ServerCommand, log_level: LogLevel) -> Result<ExitStatus> {
let ServerCommand { preview } = args; let ServerCommand { preview } = args;
let four = NonZeroUsize::new(4).unwrap();
// by default, we set the number of worker threads to `num_cpus`, with a maximum of 4. // by default, we set the number of worker threads to `num_cpus`, with a maximum of 4.
let worker_threads = num_cpus::get().max(4); let worker_threads = std::thread::available_parallelism()
commands::server::run_server( .unwrap_or(four)
preview, .max(four);
NonZeroUsize::try_from(worker_threads).expect("a non-zero worker thread count"), commands::server::run_server(preview, worker_threads, log_level)
log_level,
)
} }
pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> { pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {