rust-analyzer

diff --git a/crates/load-cargo/src/lib.rs b/crates/load-cargo/src/lib.rs
index 95fcfce291..30cd877092 100644
--- a/crates/load-cargo/src/lib.rs
+++ b/crates/load-cargo/src/lib.rs

@@ -42,6 +42,7 @@ pub struct LoadCargoConfig {

pub load_out_dirs_from_check: bool,

pub with_proc_macro_server: ProcMacroServerChoice,

pub prefill_caches: bool,

+ pub num_worker_threads: usize,

pub proc_macro_processes: usize,

}

@@ -197,7 +198,7 @@ pub fn load_workspace_into_db(

);

if load_config.prefill_caches {

- prime_caches::parallel_prime_caches(db, 1, &|_| ());

+ prime_caches::parallel_prime_caches(db, load_config.num_worker_threads, &|_| ());

}

Ok((vfs, proc_macro_server.and_then(Result::ok)))

@@ -750,6 +751,7 @@ mod tests {

load_out_dirs_from_check: false,

with_proc_macro_server: ProcMacroServerChoice::None,

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};

let (db, _vfs, _proc_macro) =

diff --git a/crates/rust-analyzer/src/cli/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs
index 82f04aa78e..ad1cca08cb 100644
--- a/crates/rust-analyzer/src/cli/analysis_stats.rs
+++ b/crates/rust-analyzer/src/cli/analysis_stats.rs

@@ -91,6 +91,7 @@ impl flags::AnalysisStats {

}

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};

diff --git a/crates/rust-analyzer/src/cli/diagnostics.rs b/crates/rust-analyzer/src/cli/diagnostics.rs
index 575c77f842..efbaad3c49 100644
--- a/crates/rust-analyzer/src/cli/diagnostics.rs
+++ b/crates/rust-analyzer/src/cli/diagnostics.rs

@@ -41,6 +41,7 @@ impl flags::Diagnostics {

load_out_dirs_from_check: !self.disable_build_scripts,

with_proc_macro_server,

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};

let (db, _vfs, _proc_macro) =

diff --git a/crates/rust-analyzer/src/cli/flags.rs b/crates/rust-analyzer/src/cli/flags.rs
index d68f7ab5b7..03849938f5 100644
--- a/crates/rust-analyzer/src/cli/flags.rs
+++ b/crates/rust-analyzer/src/cli/flags.rs

@@ -191,6 +191,9 @@ xflags::xflags! {

/// Exclude code from vendored libraries from the resulting index.

optional --exclude-vendored-libraries

+ /// The number of worker threads for cache priming. Defaults to the number of physical cores.

+ optional --num-threads num_threads: usize

}

@@ -338,6 +341,7 @@ pub struct Scip {

pub output: Option<PathBuf>,

pub config_path: Option<PathBuf>,

pub exclude_vendored_libraries: bool,

+ pub num_threads: Option<usize>,

}

impl RustAnalyzer {

diff --git a/crates/rust-analyzer/src/cli/lsif.rs b/crates/rust-analyzer/src/cli/lsif.rs
index e5e238db63..3950a581fd 100644
--- a/crates/rust-analyzer/src/cli/lsif.rs
+++ b/crates/rust-analyzer/src/cli/lsif.rs

@@ -293,6 +293,7 @@ impl flags::Lsif {

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};

let path = AbsPathBuf::assert_utf8(env::current_dir()?.join(self.path));

diff --git a/crates/rust-analyzer/src/cli/prime_caches.rs b/crates/rust-analyzer/src/cli/prime_caches.rs
index d5da679179..beedcfae4e 100644
--- a/crates/rust-analyzer/src/cli/prime_caches.rs
+++ b/crates/rust-analyzer/src/cli/prime_caches.rs

@@ -38,6 +38,7 @@ impl flags::PrimeCaches {

// we want to ensure that this command, not `load_workspace_at`,

// is responsible for that work.

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: config.proc_macro_num_processes(),

};

diff --git a/crates/rust-analyzer/src/cli/run_tests.rs b/crates/rust-analyzer/src/cli/run_tests.rs
index d4a56d773e..e8c88cadf6 100644
--- a/crates/rust-analyzer/src/cli/run_tests.rs
+++ b/crates/rust-analyzer/src/cli/run_tests.rs

@@ -23,6 +23,7 @@ impl flags::RunTests {

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};

let (ref db, _vfs, _proc_macro) =

diff --git a/crates/rust-analyzer/src/cli/rustc_tests.rs b/crates/rust-analyzer/src/cli/rustc_tests.rs
index e8c6c5f4d4..49f28352b6 100644
--- a/crates/rust-analyzer/src/cli/rustc_tests.rs
+++ b/crates/rust-analyzer/src/cli/rustc_tests.rs

@@ -103,6 +103,7 @@ impl Tester {

load_out_dirs_from_check: false,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};

let (db, _vfs, _proc_macro) =

diff --git a/crates/rust-analyzer/src/cli/scip.rs b/crates/rust-analyzer/src/cli/scip.rs
index ed0476697c..ef6d4399e6 100644
--- a/crates/rust-analyzer/src/cli/scip.rs
+++ b/crates/rust-analyzer/src/cli/scip.rs

@@ -52,6 +52,7 @@ impl flags::Scip {

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: true,

+ num_worker_threads: self.num_threads.unwrap_or_else(num_cpus::get_physical),

proc_macro_processes: config.proc_macro_num_processes(),

};

let cargo_config = config.cargo(None);

diff --git a/crates/rust-analyzer/src/cli/ssr.rs b/crates/rust-analyzer/src/cli/ssr.rs
index 6bc0792daa..7b00aebbfc 100644
--- a/crates/rust-analyzer/src/cli/ssr.rs
+++ b/crates/rust-analyzer/src/cli/ssr.rs

@@ -20,6 +20,7 @@ impl flags::Ssr {

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};

let (ref db, vfs, _proc_macro) = load_workspace_at(

@@ -57,6 +58,7 @@ impl flags::Search {

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};

let (ref db, _vfs, _proc_macro) = load_workspace_at(

diff --git a/crates/rust-analyzer/src/cli/unresolved_references.rs b/crates/rust-analyzer/src/cli/unresolved_references.rs
index 49c6fcb91e..2d9b870f4d 100644
--- a/crates/rust-analyzer/src/cli/unresolved_references.rs
+++ b/crates/rust-analyzer/src/cli/unresolved_references.rs

@@ -44,6 +44,7 @@ impl flags::UnresolvedReferences {

load_out_dirs_from_check: !self.disable_build_scripts,

with_proc_macro_server,

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: config.proc_macro_num_processes(),

};

let (db, vfs, _proc_macro) =

diff --git a/crates/rust-analyzer/src/integrated_benchmarks.rs b/crates/rust-analyzer/src/integrated_benchmarks.rs
index d16ca2fb48..6a74b8a54d 100644
--- a/crates/rust-analyzer/src/integrated_benchmarks.rs
+++ b/crates/rust-analyzer/src/integrated_benchmarks.rs

@@ -53,6 +53,7 @@ fn integrated_highlighting_benchmark() {

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: false,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};

@@ -122,6 +123,7 @@ fn integrated_completion_benchmark() {

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: true,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};

@@ -324,6 +326,7 @@ fn integrated_diagnostics_benchmark() {

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: true,

+ num_worker_threads: 1,

proc_macro_processes: 1,

};