1 files changed, 61 insertions, 18 deletions
diff --git a/crates/project_model/src/workspace.rs b/crates/project_model/src/workspace.rs
index 8e0481ae9..0220efdb4 100644
--- a/crates/project_model/src/workspace.rs
+++ b/crates/project_model/src/workspace.rs
@@ -16,8 +16,13 @@ use proc_macro_api::ProcMacroClient;
 use rustc_hash::{FxHashMap, FxHashSet};
 use crate::{
-    cargo_workspace, cfg_flag::CfgFlag, rustc_cfg, sysroot::SysrootCrate, utf8_stdout, CargoConfig,
+    build_data::{BuildData, BuildDataMap, BuildDataResult},
-    CargoWorkspace, ProjectJson, ProjectManifest, Sysroot, TargetKind,
+    cargo_workspace,
+    cfg_flag::CfgFlag,
+    rustc_cfg,
+    sysroot::SysrootCrate,
+    utf8_stdout, BuildDataCollector, CargoConfig, CargoWorkspace, ProjectJson, ProjectManifest,
+    Sysroot, TargetKind,
 };
 /// `PackageRoot` describes a package root folder.
@@ -51,6 +56,7 @@ pub enum ProjectWorkspace {
 impl fmt::Debug for ProjectWorkspace {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        // Make sure this isn't too verbose.
        match self {
            ProjectWorkspace::Cargo { cargo, sysroot, rustc, rustc_cfg } => f
                .debug_struct("Cargo")
@@ -60,7 +66,7 @@ impl fmt::Debug for ProjectWorkspace {
                    "n_rustc_compiler_crates",
                    &rustc.as_ref().map_or(0, |rc| rc.packages().len()),
                )
-                .field("rustc_cfg", rustc_cfg)
+                .field("n_rustc_cfg", &rustc_cfg.len())
                .finish(),
            ProjectWorkspace::Json { project, sysroot, rustc_cfg } => {
                let mut debug_struct = f.debug_struct("Json");
@@ -68,7 +74,7 @@ impl fmt::Debug for ProjectWorkspace {
                if let Some(sysroot) = sysroot {
                    debug_struct.field("n_sysroot_crates", &sysroot.crates().len());
                }
-                debug_struct.field("rustc_cfg", rustc_cfg);
+                debug_struct.field("n_rustc_cfg", &rustc_cfg.len());
                debug_struct.finish()
            }
        }
@@ -108,6 +114,7 @@ impl ProjectWorkspace {
                            cargo_version
                        )
                    })?;
                let sysroot = if config.no_sysroot {
                    Sysroot::default()
                } else {
@@ -119,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(|| {
@@ -152,7 +169,7 @@ impl ProjectWorkspace {
    /// Returns the roots for the current `ProjectWorkspace`
    /// The return type contains the path and whether or not
    /// the root is a member of the current workspace
-    pub fn to_roots(&self) -> Vec<PackageRoot> {
+    pub fn to_roots(&self, build_data: Option<&BuildDataResult>) -> Vec<PackageRoot> {
        match self {
            ProjectWorkspace::Json { project, sysroot, rustc_cfg: _ } => project
                .crates()
@@ -178,7 +195,12 @@ impl ProjectWorkspace {
                    let pkg_root = cargo[pkg].root().to_path_buf();
                    let mut include = vec![pkg_root.clone()];
-                    include.extend(cargo[pkg].out_dir.clone());
+                    include.extend(
+                        build_data
+                            .and_then(|it| it.get(cargo.workspace_root()))
+                            .and_then(|map| map.get(&cargo[pkg].id))
+                            .and_then(|it| it.out_dir.clone()),
+                    );
                    let mut exclude = vec![pkg_root.join(".git")];
                    if is_member {
@@ -218,6 +240,7 @@ impl ProjectWorkspace {
    pub fn to_crate_graph(
        &self,
+        build_data: Option<&BuildDataResult>,
        proc_macro_client: Option<&ProcMacroClient>,
        load: &mut dyn FnMut(&AbsPath) -> Option<FileId>,
    ) -> CrateGraph {
@@ -240,8 +263,10 @@ impl ProjectWorkspace {
                &proc_macro_loader,
                load,
                cargo,
+                build_data.and_then(|it| it.get(cargo.workspace_root())),
                sysroot,
                rustc,
+                rustc.as_ref().zip(build_data).and_then(|(it, map)| map.get(it.workspace_root())),
            ),
        };
        if crate_graph.patch_cfg_if() {
@@ -251,6 +276,18 @@ impl ProjectWorkspace {
        }
        crate_graph
    }
+    pub fn collect_build_data_configs(&self, collector: &mut BuildDataCollector) {
+        match self {
+            ProjectWorkspace::Cargo { cargo, rustc, .. } => {
+                collector.add_config(&cargo.workspace_root(), cargo.build_data_config().clone());
+                if let Some(rustc) = rustc {
+                    collector.add_config(rustc.workspace_root(), rustc.build_data_config().clone());
+                }
+            }
+            _ => {}
+        }
+    }
 }
 fn project_json_to_crate_graph(
@@ -323,8 +360,10 @@ fn cargo_to_crate_graph(
    proc_macro_loader: &dyn Fn(&Path) -> Vec<ProcMacro>,
    load: &mut dyn FnMut(&AbsPath) -> Option<FileId>,
    cargo: &CargoWorkspace,
+    build_data_map: Option<&BuildDataMap>,
    sysroot: &Sysroot,
    rustc: &Option<CargoWorkspace>,
+    rustc_build_data_map: Option<&BuildDataMap>,
 ) -> CrateGraph {
    let _p = profile::span("cargo_to_crate_graph");
    let mut crate_graph = CrateGraph::default();
@@ -350,6 +389,7 @@ fn cargo_to_crate_graph(
                let crate_id = add_target_crate_root(
                    &mut crate_graph,
                    &cargo[pkg],
+                    build_data_map.and_then(|it| it.get(&cargo[pkg].id)),
                    &cfg_options,
                    proc_macro_loader,
                    file_id,
@@ -426,6 +466,7 @@ fn cargo_to_crate_graph(
                    let crate_id = add_target_crate_root(
                        &mut crate_graph,
                        &rustc_workspace[pkg],
+                        rustc_build_data_map.and_then(|it| it.get(&rustc_workspace[pkg].id)),
                        &cfg_options,
                        proc_macro_loader,
                        file_id,
@@ -474,6 +515,7 @@ fn cargo_to_crate_graph(
 fn add_target_crate_root(
    crate_graph: &mut CrateGraph,
    pkg: &cargo_workspace::PackageData,
+    build_data: Option<&BuildData>,
    cfg_options: &CfgOptions,
    proc_macro_loader: &dyn Fn(&Path) -> Vec<ProcMacro>,
    file_id: FileId,
@@ -481,26 +523,27 @@ fn add_target_crate_root(
    let edition = pkg.edition;
    let cfg_options = {
        let mut opts = cfg_options.clone();
-        for feature in pkg.features.iter() {
+        for feature in pkg.active_features.iter() {
            opts.insert_key_value("feature".into(), feature.into());
        }
-        opts.extend(pkg.cfgs.iter().cloned());
+        if let Some(cfgs) = build_data.as_ref().map(|it| &it.cfgs) {
+            opts.extend(cfgs.iter().cloned());
+        }
        opts
    };
    let mut env = Env::default();
-    for (k, v) in &pkg.envs {
+    if let Some(envs) = build_data.map(|it| &it.envs) {
-        env.set(k, v.clone());
+        for (k, v) in envs {
-    }
+            env.set(k, v.clone());
-    if let Some(out_dir) = &pkg.out_dir {
-        // NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
-        if let Some(out_dir) = out_dir.to_str().map(|s| s.to_owned()) {
-            env.set("OUT_DIR", out_dir);
        }
    }
-    let proc_macro =
+    let proc_macro = build_data
-        pkg.proc_macro_dylib_path.as_ref().map(|it| proc_macro_loader(&it)).unwrap_or_default();
+        .as_ref()
+        .and_then(|it| it.proc_macro_dylib_path.as_ref())
+        .map(|it| proc_macro_loader(&it))
+        .unwrap_or_default();
    let display_name = CrateDisplayName::from_canonical_name(pkg.name.clone());
    let crate_id = crate_graph.add_crate_root(