From d02c726eb4c5651722b19fc3ff80817cbe5a19cb Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Sun, 29 Apr 2018 21:55:57 +0200
Subject: [PATCH] Store unit dependencies directly into Context

---
 src/cargo/core/compiler/context/mod.rs               | 3 +--
 src/cargo/core/compiler/context/unit_dependencies.rs | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/cargo/core/compiler/context/mod.rs b/src/cargo/core/compiler/context/mod.rs
index 1a8230323..a0e166860 100644
--- a/src/cargo/core/compiler/context/mod.rs
+++ b/src/cargo/core/compiler/context/mod.rs
@@ -266,8 +266,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
             None => None,
         };
 
-        let deps = build_unit_dependencies(units, self.bcx)?;
-        self.unit_dependencies = deps;
+        build_unit_dependencies(units, self.bcx, &mut self.unit_dependencies)?;
         let files = CompilationFiles::new(
             units,
             host_layout,
diff --git a/src/cargo/core/compiler/context/unit_dependencies.rs b/src/cargo/core/compiler/context/unit_dependencies.rs
index 08d7ed410..ee66f62d9 100644
--- a/src/cargo/core/compiler/context/unit_dependencies.rs
+++ b/src/cargo/core/compiler/context/unit_dependencies.rs
@@ -26,8 +26,8 @@ use CargoResult;
 pub fn build_unit_dependencies<'a, 'cfg>(
     roots: &[Unit<'a>],
     bcx: &BuildContext<'a, 'cfg>,
-) -> CargoResult<HashMap<Unit<'a>, Vec<Unit<'a>>>> {
-    let mut deps = HashMap::new();
+    mut deps: &mut HashMap<Unit<'a>, Vec<Unit<'a>>>,
+) -> CargoResult<()> {
     for unit in roots.iter() {
         // Dependencies of tests/benches should not have `panic` set.
         // We check the global test mode to see if we are running in `cargo
@@ -43,7 +43,7 @@ pub fn build_unit_dependencies<'a, 'cfg>(
         deps_of(unit, bcx, &mut deps, profile_for)?;
     }
 
-    Ok(deps)
+    Ok(())
 }
 
 fn deps_of<'a, 'b, 'cfg>(
-- 
2.30.2