Auto merge of #12457 - Veykril:logging, r=Veykril

internal: Don't log default build script outputs
rust-lang · Jun 3, 2022 · 8b30ac0 · 8b30ac0
2 parents 58b6d46 + 44e4f20
commit 8b30ac0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/crates/project-model/src/build_scripts.rs b/crates/project-model/src/build_scripts.rs
@@ -18,7 +18,7 @@ use crate::{cfg_flag::CfgFlag, CargoConfig, CargoWorkspace, Package};
 
 #[derive(Debug, Default, Clone, PartialEq, Eq)]
 pub struct WorkspaceBuildScripts {
-    pub(crate) outputs: ArenaMap<Package, BuildScriptOutput>,
+    outputs: ArenaMap<Package, Option<BuildScriptOutput>>,
     error: Option<String>,
 }
 
@@ -72,6 +72,7 @@ impl WorkspaceBuildScripts {
 
         cmd
     }
+
     pub(crate) fn run(
         config: &CargoConfig,
         workspace: &CargoWorkspace,
@@ -94,12 +95,8 @@ impl WorkspaceBuildScripts {
         // NB: Cargo.toml could have been modified between `cargo metadata` and
         // `cargo check`. We shouldn't assume that package ids we see here are
         // exactly those from `config`.
-        let mut by_id: FxHashMap<String, Package> = FxHashMap::default();
-
-        for package in workspace.packages() {
-            res.outputs.insert(package, BuildScriptOutput::default());
-            by_id.insert(workspace[package].id.clone(), package);
-        }
+        let by_id: FxHashMap<String, Package> =
+            workspace.packages().map(|package| (workspace[package].id.clone(), package)).collect();
 
         let errors = RefCell::new(String::new());
         let push_err = |err: &str| {
@@ -141,7 +138,8 @@ impl WorkspaceBuildScripts {
                             }
                             acc
                         };
-                        let package_build_data = &mut res.outputs[package];
+                        let package_build_data =
+                            res.outputs[package].get_or_insert_with(Default::default);
                         // cargo_metadata crate returns default (empty) path for
                         // older cargos, which is not absolute, so work around that.
                         if !message.out_dir.as_str().is_empty() {
@@ -167,7 +165,9 @@ impl WorkspaceBuildScripts {
                                 message.filenames.iter().find(|name| is_dylib(name))
                             {
                                 let filename = AbsPathBuf::assert(PathBuf::from(&filename));
-                                res.outputs[package].proc_macro_dylib_path = Some(filename);
+                                res.outputs[package]
+                                    .get_or_insert_with(Default::default)
+                                    .proc_macro_dylib_path = Some(filename);
                             }
                         }
                     }
@@ -189,17 +189,18 @@ impl WorkspaceBuildScripts {
         )?;
 
         for package in workspace.packages() {
-            let package_build_data = &mut res.outputs[package];
-            tracing::info!(
-                "{} BuildScriptOutput: {:?}",
-                workspace[package].manifest.parent().display(),
-                package_build_data,
-            );
-            // inject_cargo_env(package, package_build_data);
-            if let Some(out_dir) = &package_build_data.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.as_os_str().to_str().map(|s| s.to_owned()) {
-                    package_build_data.envs.push(("OUT_DIR".to_string(), out_dir));
+            if let Some(package_build_data) = &mut res.outputs[package] {
+                tracing::info!(
+                    "{} BuildScriptOutput: {:?}",
+                    workspace[package].manifest.parent().display(),
+                    package_build_data,
+                );
+                // inject_cargo_env(package, package_build_data);
+                if let Some(out_dir) = &package_build_data.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.as_os_str().to_str().map(|s| s.to_owned()) {
+                        package_build_data.envs.push(("OUT_DIR".to_string(), out_dir));
+                    }
                 }
             }
         }
@@ -218,6 +219,10 @@ impl WorkspaceBuildScripts {
     pub fn error(&self) -> Option<&str> {
         self.error.as_deref()
     }
+
+    pub(crate) fn get_output(&self, idx: Package) -> Option<&BuildScriptOutput> {
+        self.outputs.get(idx)?.as_ref()
+    }
 }
 
 // FIXME: File a better way to know if it is a dylib.

diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs
@@ -312,9 +312,9 @@ impl ProjectWorkspace {
                         let pkg_root = cargo[pkg].manifest.parent().to_path_buf();
 
                         let mut include = vec![pkg_root.clone()];
-                        include.extend(
-                            build_scripts.outputs.get(pkg).and_then(|it| it.out_dir.clone()),
-                        );
+                        let out_dir =
+                            build_scripts.get_output(pkg).and_then(|it| it.out_dir.clone());
+                        include.extend(out_dir);
 
                         // In case target's path is manually set in Cargo.toml to be
                         // outside the package root, add its parent as an extra include.
@@ -586,7 +586,7 @@ fn cargo_to_crate_graph(
                 let crate_id = add_target_crate_root(
                     &mut crate_graph,
                     &cargo[pkg],
-                    build_scripts.outputs.get(pkg),
+                    build_scripts.get_output(pkg),
                     cfg_options,
                     &mut |path| load_proc_macro(&cargo[tgt].name, path),
                     file_id,