Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/load-cargo/src/lib.rs')
| -rw-r--r-- | crates/load-cargo/src/lib.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crates/load-cargo/src/lib.rs b/crates/load-cargo/src/lib.rs index ad838a6550..a486219efa 100644 --- a/crates/load-cargo/src/lib.rs +++ b/crates/load-cargo/src/lib.rs @@ -96,12 +96,13 @@ pub fn load_workspace_into_db( tracing::debug!(?load_config, "LoadCargoConfig"); let proc_macro_server = match &load_config.with_proc_macro_server { ProcMacroServerChoice::Sysroot => ws.find_sysroot_proc_macro_srv().map(|it| { - it.and_then(|it| ProcMacroClient::spawn(&it, extra_env).map_err(Into::into)).map_err( - |e| ProcMacroLoadingError::ProcMacroSrvError(e.to_string().into_boxed_str()), - ) + it.and_then(|it| { + ProcMacroClient::spawn(&it, extra_env, ws.toolchain.as_ref()).map_err(Into::into) + }) + .map_err(|e| ProcMacroLoadingError::ProcMacroSrvError(e.to_string().into_boxed_str())) }), ProcMacroServerChoice::Explicit(path) => { - Some(ProcMacroClient::spawn(path, extra_env).map_err(|e| { + Some(ProcMacroClient::spawn(path, extra_env, ws.toolchain.as_ref()).map_err(|e| { ProcMacroLoadingError::ProcMacroSrvError(e.to_string().into_boxed_str()) })) } |