mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #13289 - rust-lang:analysis-stats-proc-server, r=Veykril

Browse Source 
Use the sysroot proc-macro server for analysis-stats

Should fix the metrics issues
This commit is contained in:
bors 2022-09-24 20:04:48 +00:00
commit 73ab709b38
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/rust-analyzer/src/cli/load_cargo.rs
View File

@ -60,10 +60,26 @@ pub fn load_workspace(
}; };
let proc_macro_client = if load_config.with_proc_macro { let proc_macro_client = if load_config.with_proc_macro {
let path = AbsPathBuf::assert(std::env::current_exe()?); let mut path = AbsPathBuf::assert(std::env::current_exe()?);
Ok(ProcMacroServer::spawn(path, &["proc-macro"]).unwrap()) let mut args = vec!["proc-macro"];
if let ProjectWorkspace::Cargo { sysroot, .. } | ProjectWorkspace::Json { sysroot, .. } =
&ws
{
if let Some(sysroot) = sysroot.as_ref() {
let standalone_server_name =
format!("rust-analyzer-proc-macro-srv{}", std::env::consts::EXE_SUFFIX);
let server_path = sysroot.root().join("libexec").join(&standalone_server_name);
if std::fs::metadata(&server_path).is_ok() {
path = server_path;
args = vec![];
}
}
}
ProcMacroServer::spawn(path.clone(), args.clone()).map_err(|e| e.to_string())
} else { } else {
Err("proc macro server not started".to_owned()) Err("proc macro server disabled".to_owned())
}; };
let crate_graph = ws.to_crate_graph( let crate_graph = ws.to_crate_graph(