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

Remember the difference between 'sysroot root' and 'sysroot src root', start looking in there for a rust-analyzer-proc-macro-srv binary

Browse source
This commit is contained in:
Amos Wenger 2022-07-25 16:07:41 +02:00
parent 4364531c2f
commit dadb83282d
5 changed files with 63 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/project-model/src/workspace.rs
View file

@ -230,8 +230,14 @@ impl ProjectWorkspace {
project_json: ProjectJson,
target: Option<&str>,
) -> Result<ProjectWorkspace> {
let sysroot = match &project_json.sysroot_src {
Some(path) => Some(Sysroot::load(path.clone())?),
let sysroot = match project_json.sysroot_src.clone() {
Some(sysroot_src) => {
// if `sysroot` isn't specified (only `sysroot_src`), we won't have
// a real sysroot path, that's fine. it's just used to discover
// the standalone `proc-macro-srv` binary.
let sysroot = project_json.sysroot.clone().unwrap_or_else(|| sysroot_src.clone());
Some(Sysroot::load(sysroot, sysroot_src)?)
}
None => None,
};
let rustc_cfg = rustc_cfg::get(None, target);
@ -345,7 +351,7 @@ impl ProjectWorkspace {
})
.chain(sysroot.iter().map(|sysroot| PackageRoot {
is_local: false,
include: vec![sysroot.root().to_path_buf()],
include: vec![sysroot.src_root().to_path_buf()],
exclude: Vec::new(),
}))
.chain(rustc.iter().flat_map(|rustc| {