refactor(compile): Track manifest deps in unit graph

Author: epage

src/cargo/core/compiler/unit_dependencies.rs

@@ -35,6 +35,7 @@ use crate::core::{
 };
 use crate::ops::resolve_all_features;
 use crate::util::GlobalContext;
+use crate::util::Unhashed;
 use crate::util::interning::InternedString;
 
 const IS_NO_ARTIFACT_DEP: Option<&'static Artifact> = None;
@@ -206,6 +207,8 @@ fn attach_std_deps(
                 // TODO: Does this `public` make sense?
                 public: true,
                 noprelude: true,
+                // Artificial dependency
+                manifest_deps: Unhashed(None),
             }));
             found = true;
         }
@@ -305,6 +308,8 @@ fn compute_deps(
         let mode = check_or_build_mode(unit.mode, dep_lib);
         let dep_unit_for = unit_for.with_dependency(unit, dep_lib, unit_for.root_compile_kind());
 
+        let manifest_deps = deps.iter().map(|d| (*d).clone()).collect::<Vec<_>>();
+
         let start = ret.len();
         if state.gctx.cli_unstable().dual_proc_macros
             && dep_lib.proc_macro()
@@ -315,6 +320,7 @@ fn compute_deps(
                 unit,
                 dep_pkg,
                 dep_lib,
+                Some(manifest_deps.clone()),
                 dep_unit_for,
                 unit.kind,
                 mode,
@@ -326,6 +332,7 @@ fn compute_deps(
                 unit,
                 dep_pkg,
                 dep_lib,
+                Some(manifest_deps),
                 dep_unit_for,
                 CompileKind::Host,
                 mode,
@@ -338,6 +345,7 @@ fn compute_deps(
                 unit,
                 dep_pkg,
                 dep_lib,
+                Some(manifest_deps),
                 dep_unit_for,
                 unit.kind.for_target(dep_lib),
                 mode,
@@ -416,6 +424,7 @@ fn compute_deps(
                         unit,
                         &unit.pkg,
                         t,
+                        None, // artificial
                         UnitFor::new_normal(unit_for.root_compile_kind()),
                         unit.kind.for_target(t),
                         CompileMode::Build,
@@ -511,6 +520,7 @@ fn compute_deps_custom_build(
         unit,
         &unit.pkg,
         &unit.target,
+        None, // artificial
         script_unit_for,
         // Build scripts always compiled for the host.
         CompileKind::Host,
@@ -604,6 +614,7 @@ fn artifact_targets_to_unit_deps(
                                     target
                                         .clone()
                                         .set_kind(TargetKind::Lib(vec![target_kind.clone()])),
+                                    None, // TBD
                                     parent_unit_for,
                                     compile_kind,
                                     CompileMode::Build,
@@ -616,6 +627,7 @@ fn artifact_targets_to_unit_deps(
                         parent,
                         artifact_pkg,
                         target,
+                        None, // TBD
                         parent_unit_for,
                         compile_kind,
                         CompileMode::Build,
@@ -651,6 +663,7 @@ fn compute_deps_doc(
             unit,
             dep_pkg,
             dep_lib,
+            None, // not checking unused deps
             dep_unit_for,
             unit.kind.for_target(dep_lib),
             mode,
@@ -664,6 +677,7 @@ fn compute_deps_doc(
                 unit,
                 dep_pkg,
                 dep_lib,
+                None, // not checking unused deps
                 dep_unit_for,
                 unit.kind.for_target(dep_lib),
                 unit.mode,
@@ -697,6 +711,7 @@ fn compute_deps_doc(
                 unit,
                 &unit.pkg,
                 lib,
+                None, // not checking unused deps
                 dep_unit_for,
                 unit.kind.for_target(lib),
                 unit.mode,
@@ -716,6 +731,7 @@ fn compute_deps_doc(
                 scrape_unit,
                 &scrape_unit.pkg,
                 &scrape_unit.target,
+                None, // not checking unused deps
                 scrape_unit_for,
                 scrape_unit.kind,
                 scrape_unit.mode,
@@ -744,6 +760,7 @@ fn maybe_lib(
                 unit,
                 &unit.pkg,
                 t,
+                None,
                 dep_unit_for,
                 unit.kind.for_target(t),
                 mode,
@@ -805,6 +822,7 @@ fn dep_build_script(
                     unit,
                     &unit.pkg,
                     t,
+                    None, // artificial
                     script_unit_for,
                     unit.kind,
                     CompileMode::RunCustomBuild,
@@ -841,6 +859,7 @@ fn new_unit_dep(
     parent: &Unit,
     pkg: &Package,
     target: &Target,
+    manifest_deps: Option<Vec<Dependency>>,
     unit_for: UnitFor,
     kind: CompileKind,
     mode: CompileMode,
@@ -855,7 +874,16 @@ fn new_unit_dep(
         kind,
     );
     new_unit_dep_with_profile(
-        state, parent, pkg, target, unit_for, kind, mode, profile, artifact,
+        state,
+        parent,
+        pkg,
+        target,
+        manifest_deps,
+        unit_for,
+        kind,
+        mode,
+        profile,
+        artifact,
     )
 }
 
@@ -864,6 +892,7 @@ fn new_unit_dep_with_profile(
     parent: &Unit,
     pkg: &Package,
     target: &Target,
+    manifest_deps: Option<Vec<Dependency>>,
     unit_for: UnitFor,
     kind: CompileKind,
     mode: CompileMode,
@@ -911,6 +940,7 @@ fn new_unit_dep_with_profile(
         dep_name,
         public,
         noprelude: false,
+        manifest_deps: Unhashed(manifest_deps),
     })
 }
 

src/cargo/core/compiler/unit_graph.rs

@@ -8,8 +8,10 @@ use crate::GlobalContext;
 use crate::core::Target;
 use crate::core::compiler::Unit;
 use crate::core::compiler::{CompileKind, CompileMode};
+use crate::core::dependency::Dependency;
 use crate::core::profiles::{Profile, UnitFor};
 use crate::util::CargoResult;
+use crate::util::Unhashed;
 use crate::util::interning::InternedString;
 use std::collections::HashMap;
 
@@ -40,6 +42,8 @@ pub struct UnitDep {
     pub public: bool,
     /// If `true`, the dependency should not be added to Rust's prelude.
     pub noprelude: bool,
+    /// The manifest dependency that gave rise to this dependency
+    pub manifest_deps: Unhashed<Option<Vec<Dependency>>>,
 }
 
 const VERSION: u32 = 1;