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

fix: Pass the build data to rustc_private crates

Browse source
This commit is contained in:
Lukas Wirth 2022-06-12 19:29:45 +02:00
parent 4f2a67b26f
commit 10e9f47dce
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -667,6 +667,7 @@ fn cargo_to_crate_graph(
&public_deps,
cargo,
&pkg_crates,
build_scripts,
);
}
}
@ -728,6 +729,7 @@ fn handle_rustc_crates(
public_deps: &SysrootPublicDeps,
cargo: &CargoWorkspace,
pkg_crates: &FxHashMap<la_arena::Idx<crate::PackageData>, Vec<(CrateId, TargetKind)>>,
build_scripts: &WorkspaceBuildScripts,
) {
let mut rustc_pkg_crates = FxHashMap::default();
// The root package of the rustc-dev component is rustc_driver, so we match that
@ -781,7 +783,7 @@ fn handle_rustc_crates(
let crate_id = add_target_crate_root(
crate_graph,
&rustc_workspace[pkg],
None,
build_scripts.get_output(pkg),
cfg_options,
&mut |path| load_proc_macro(&rustc_workspace[tgt].name, path),
file_id,