language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Allow automatically detect the rustc-src directory (fixes #3517).

Browse source 
If the configured rustcSource is set to "discover", try to automatically
detect a source from the sysroot rustc directory.
This commit is contained in:
Benjamin Bouvier 2021-02-11 17:34:56 +01:00
parent 2967e783ac
commit 4a6e602c94
7 changed files with 67 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/project_model/src/workspace.rs
View file

@ -114,6 +114,7 @@ impl ProjectWorkspace {
cargo_version
)
})?;
let sysroot = if config.no_sysroot {
Sysroot::default()
} else {
@ -125,7 +126,17 @@ impl ProjectWorkspace {
})?
};
let rustc = if let Some(rustc_dir) = &config.rustc_source {
let rustc_dir = if let Some(rustc_source) = &config.rustc_source {
use cargo_workspace::RustcSource;
match rustc_source {
RustcSource::Path(path) => Some(path.clone()),
RustcSource::Discover => Sysroot::discover_rustc(&cargo_toml),
}
} else {
None
};
let rustc = if let Some(rustc_dir) = rustc_dir {
Some(
CargoWorkspace::from_cargo_metadata(&rustc_dir, config, progress)
.with_context(|| {