Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #22766 from Veykril/lukaswirth/push-rwmmzyuozvpl
internal: Share same proc-macro servers between workspaces
| -rw-r--r-- | crates/proc-macro-api/src/lib.rs | 4 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/config.rs | 2 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/reload.rs | 45 | ||||
| -rw-r--r-- | docs/book/src/configuration_generated.md | 2 | ||||
| -rw-r--r-- | editors/code/package.json | 2 |
5 files changed, 35 insertions, 20 deletions
diff --git a/crates/proc-macro-api/src/lib.rs b/crates/proc-macro-api/src/lib.rs index 149f6e44f9..7b2e209b8e 100644 --- a/crates/proc-macro-api/src/lib.rs +++ b/crates/proc-macro-api/src/lib.rs @@ -78,9 +78,9 @@ pub enum ProcMacroKind { Bang, } -/// A handle to an external process which load dylibs with macros (.so or .dll) +/// A handle to proc-macro server process pool which load dylibs with macros (.so or .dll) /// and runs actual macro expansion functions. -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct ProcMacroClient { /// Currently, the proc macro process expands all procedural macros sequentially. /// diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 552fb079c2..f464a24875 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -395,7 +395,7 @@ config_data! { /// /// Controls how many independent `proc-macro-srv` processes rust-analyzer /// runs in parallel to handle macro expansion. - procMacro_processes: NumProcesses = NumProcesses::Concrete(1), + procMacro_processes: NumProcesses = NumProcesses::Concrete(2), /// Internal config, path to proc-macro server executable. procMacro_server: Option<Utf8PathBuf> = None, diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs index ace44b02fe..c72f678205 100644 --- a/crates/rust-analyzer/src/reload.rs +++ b/crates/rust-analyzer/src/reload.rs @@ -659,11 +659,16 @@ impl GlobalState { Config::user_config_dir_path().as_deref(), ); - if (self.proc_macro_clients.len() < self.workspaces.len() || !same_workspaces) - && self.config.expand_proc_macros() - { + if !same_workspaces && self.config.expand_proc_macros() { info!("Spawning proc-macro servers"); + // Workspaces referring to the same proc-macro server executable (i.e. the same + // sysroot) with an identical spawn environment share a single client, and thereby + // a single set of server processes. + let mut clients: Vec<( + (AbsPathBuf, Option<semver::Version>, FxHashMap<String, Option<String>>), + ProcMacroClient, + )> = Vec::new(); self.proc_macro_clients = Arc::from_iter(self.workspaces.iter().map(|ws| { let path = match self.config.proc_macro_srv() { Some(path) => path, @@ -695,20 +700,30 @@ impl GlobalState { _ => Default::default(), }; - info!("Using proc-macro server at {path}"); + + let key = (path, ws.toolchain.clone(), env); + if let Some((_, client)) = clients.iter().find(|(k, _)| *k == key) { + return Some(Ok(client.clone())); + } + + let (path, toolchain, env) = &key; + info!("Spawning proc-macro server at {path}"); let num_process = self.config.proc_macro_num_processes(); - 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:?}", - ) - }), - ) + Some(match ProcMacroClient::spawn(path, env, toolchain.as_ref(), num_process) { + Ok(client) => { + clients.push((key.clone(), client.clone())); + Ok(client) + } + Err(err) => { + tracing::error!( + "Failed to run proc-macro server from path {path}, error: {err:?}", + ); + Err(anyhow::format_err!( + "Failed to run proc-macro server from path {path}, error: {err:?}", + )) + } + }) })) } diff --git a/docs/book/src/configuration_generated.md b/docs/book/src/configuration_generated.md index 1f94639074..9d865a7936 100644 --- a/docs/book/src/configuration_generated.md +++ b/docs/book/src/configuration_generated.md @@ -1368,7 +1368,7 @@ This config takes a map of crate names with the exported proc-macro names to ign ## rust-analyzer.procMacro.processes {#procMacro.processes} -Default: `1` +Default: `2` Number of proc-macro server processes to spawn. diff --git a/editors/code/package.json b/editors/code/package.json index c9ab57be99..92279a8c0d 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -2873,7 +2873,7 @@ "properties": { "rust-analyzer.procMacro.processes": { "markdownDescription": "Number of proc-macro server processes to spawn.\n\nControls how many independent `proc-macro-srv` processes rust-analyzer\nruns in parallel to handle macro expansion.", - "default": 1, + "default": 2, "anyOf": [ { "type": "number", |