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

Load proc-macros for rustc_private crates

Browse source
This commit is contained in:
Lukas Wirth 2023-03-08 12:41:38 +01:00
parent ecc32c2f85
commit c9786484c5
3 changed files with 98 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/project-model/src/sysroot.rs
View file

@ -88,23 +88,17 @@ impl Sysroot {
}
pub fn discover_with_src_override(
dir: &AbsPath,
current_dir: &AbsPath,
extra_env: &FxHashMap<String, String>,
src: AbsPathBuf,
) -> Result<Sysroot> {
tracing::debug!("discovering sysroot for {}", dir.display());
let sysroot_dir = discover_sysroot_dir(dir, extra_env)?;
tracing::debug!("discovering sysroot for {}", current_dir.display());
let sysroot_dir = discover_sysroot_dir(current_dir, extra_env)?;
Ok(Sysroot::load(sysroot_dir, src))
}
pub fn discover_rustc(
cargo_toml: &ManifestPath,
extra_env: &FxHashMap<String, String>,
) -> Option<ManifestPath> {
tracing::debug!("discovering rustc source for {}", cargo_toml.display());
let current_dir = cargo_toml.parent();
let sysroot_dir = discover_sysroot_dir(current_dir, extra_env).ok()?;
get_rustc_src(&sysroot_dir)
pub fn discover_rustc(&self) -> Option<ManifestPath> {
get_rustc_src(&self.root)
}
pub fn with_sysroot_dir(sysroot_dir: AbsPathBuf) -> Result<Sysroot> {