rust-analyzer

diff --git a/crates/proc-macro-api/src/lib.rs b/crates/proc-macro-api/src/lib.rs
index ad462ff31a..2c0008ae1d 100644
--- a/crates/proc-macro-api/src/lib.rs
+++ b/crates/proc-macro-api/src/lib.rs

@@ -29,9 +29,7 @@ use std::{fmt, io, sync::Arc, time::SystemTime};

pub use crate::transport::codec::Codec;

use crate::{

- bidirectional_protocol::SubCallback,

- pool::{ProcMacroServerPool, default_pool_size},

- process::ProcMacroServerProcess,

+ bidirectional_protocol::SubCallback, pool::ProcMacroServerPool, process::ProcMacroServerProcess,

};

/// The versions of the server protocol

@@ -155,6 +153,7 @@ impl ProcMacroClient {

Item = (impl AsRef<std::ffi::OsStr>, &'a Option<impl 'a + AsRef<std::ffi::OsStr>>),

> + Clone,

version: Option<&Version>,

+ num_process: usize,

) -> io::Result<ProcMacroClient> {

let process = ProcMacroServerProcess::spawn(process_path, env, version)?;

Ok(ProcMacroClient { process: Arc::new(process), path: process_path.to_owned() })

diff --git a/crates/rust-analyzer/src/cli/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs
index a02d1a7856..1995d38898 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,

+ proc_macro_processes: 1,

};

let build_scripts_time = if self.disable_build_scripts {

diff --git a/crates/rust-analyzer/src/cli/diagnostics.rs b/crates/rust-analyzer/src/cli/diagnostics.rs
index 776069f155..575c77f842 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,

+ proc_macro_processes: 1,

};

let (db, _vfs, _proc_macro) =

load_workspace_at(&self.path, &cargo_config, &load_cargo_config, &|_| {})?;

diff --git a/crates/rust-analyzer/src/cli/lsif.rs b/crates/rust-analyzer/src/cli/lsif.rs
index f3b0699d55..e5e238db63 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,

+ proc_macro_processes: 1,

};

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

let root = ProjectManifest::discover_single(&path)?;

diff --git a/crates/rust-analyzer/src/cli/prime_caches.rs b/crates/rust-analyzer/src/cli/prime_caches.rs
index 467d8a5388..d5da679179 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,

+ proc_macro_processes: config.proc_macro_num_processes(),

};

let root = AbsPathBuf::assert_utf8(std::env::current_dir()?.join(root));

diff --git a/crates/rust-analyzer/src/cli/run_tests.rs b/crates/rust-analyzer/src/cli/run_tests.rs
index 82ace8c8b3..d4a56d773e 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,

+ proc_macro_processes: 1,

};

let (ref db, _vfs, _proc_macro) =

load_workspace_at(&self.path, &cargo_config, &load_cargo_config, &|_| {})?;

diff --git a/crates/rust-analyzer/src/cli/rustc_tests.rs b/crates/rust-analyzer/src/cli/rustc_tests.rs
index 249566d2ac..e8c6c5f4d4 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,

+ proc_macro_processes: 1,

};

let (db, _vfs, _proc_macro) =

load_workspace(workspace, &cargo_config.extra_env, &load_cargo_config)?;

diff --git a/crates/rust-analyzer/src/cli/scip.rs b/crates/rust-analyzer/src/cli/scip.rs
index 271d2507bc..ed0476697c 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,

+ proc_macro_processes: config.proc_macro_num_processes(),

};

let cargo_config = config.cargo(None);

let (db, vfs, _) = load_workspace_at(

diff --git a/crates/rust-analyzer/src/cli/ssr.rs b/crates/rust-analyzer/src/cli/ssr.rs
index 3918683145..5c69bda723 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,

+ proc_macro_processes: 1,

};

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

&std::env::current_dir()?,

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

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: false,

+ proc_macro_processes: 1,

};

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

&std::env::current_dir()?,

diff --git a/crates/rust-analyzer/src/cli/unresolved_references.rs b/crates/rust-analyzer/src/cli/unresolved_references.rs
index 294add682d..49c6fcb91e 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,

+ proc_macro_processes: config.proc_macro_num_processes(),

};

let (db, vfs, _proc_macro) =

load_workspace_at(&self.path, &cargo_config, &load_cargo_config, &|_| {})?;

diff --git a/crates/rust-analyzer/src/integrated_benchmarks.rs b/crates/rust-analyzer/src/integrated_benchmarks.rs
index c61825b99f..d16ca2fb48 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,

+ proc_macro_processes: 1,

};

let (db, vfs, _proc_macro) = {

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

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: true,

+ proc_macro_processes: 1,

};

let (db, vfs, _proc_macro) = {

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

load_out_dirs_from_check: true,

with_proc_macro_server: ProcMacroServerChoice::Sysroot,

prefill_caches: true,

+ proc_macro_processes: 1,

};

let (db, vfs, _proc_macro) = {

diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index ccafbd7b30..83f4a19b39 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs

@@ -701,15 +701,19 @@ impl GlobalState {

_ => Default::default(),

};

info!("Using proc-macro server at {path}");

+ let num_process = self.config.proc_macro_num_processes();

- Some(ProcMacroClient::spawn(&path, &env, ws.toolchain.as_ref()).map_err(|err| {

- tracing::error!(

- "Failed to run proc-macro server from path {path}, error: {err:?}",

- );

- anyhow::format_err!(

- "Failed to run proc-macro server from path {path}, error: {err:?}",

- )

- }))

+ Some(

+ ProcMacroClient::spawn(&path, &env, ws.toolchain.as_ref(), num_process)

+ .map_err(|err| {

+ tracing::error!(

+ "Failed to run proc-macro server from path {path}, error: {err:?}",

+ );

+ anyhow::format_err!(

+ "Failed to run proc-macro server from path {path}, error: {err:?}",

+ )

+ }),

+ )

}))

}