language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' of github.com:rust-analyzer/rust-analyzer

Browse source
This commit is contained in:
Benjamin Coenen 2020-04-18 17:14:24 +02:00
commit af3c19e85f
30 changed files with 708 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/rust-analyzer/src/cli/load_cargo.rs
View file

@ -75,9 +75,7 @@ pub(crate) fn load_cargo(
let proc_macro_client = if !with_proc_macro {
ProcMacroClient::dummy()
} else {
let mut path = std::env::current_exe()?;
path.pop();
path.push("rust-analyzer");
let path = std::env::current_exe()?;
ProcMacroClient::extern_process(&path, &["proc-macro"]).unwrap()
};
let host = load(&source_roots, ws, &mut vfs, receiver, extern_dirs, &proc_macro_client);

4
crates/rust-analyzer/src/config.rs
View file

@ -134,9 +134,7 @@ impl Config {
match get::<bool>(value, "/procMacro/enabled") {
Some(true) => {
if let Ok(mut path) = std::env::current_exe() {
path.pop();
path.push("rust-analyzer");
if let Ok(path) = std::env::current_exe() {
self.proc_macro_srv = Some((path.to_string_lossy().to_string(), vec!["proc-macro".to_string()]));
}
}