Let Context store BuildConfig by reference

diff --git a/src/cargo/core/compiler/context/mod.rs b/src/cargo/core/compiler/context/mod.rs
index f3d1e6d18ed94b3f225e49df1dd0ba1cd2024221..8992cf719953c5f2aedb2cde9c799b9a6c18b9c3 100644 (file)
--- a/src/cargo/core/compiler/context/mod.rs
+++ b/src/cargo/core/compiler/context/mod.rs
@@ -86,7 +86,7 @@ pub struct Context<'a, 'cfg: 'a> {
     pub build_explicit_deps: HashMap<Unit<'a>, BuildDeps>,
     pub fingerprints: HashMap<Unit<'a>, Arc<Fingerprint>>,
     pub compiled: HashSet<Unit<'a>>,
-    pub build_config: BuildConfig,
+    pub build_config: &'a BuildConfig,
     pub build_scripts: HashMap<Unit<'a>, Arc<BuildScripts>>,
     pub links: Links<'a>,
     pub used_in_plugin: HashSet<Unit<'a>>,
@@ -113,7 +113,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
         resolve: &'a Resolve,
         packages: &'a PackageSet<'cfg>,
         config: &'cfg Config,
-        build_config: BuildConfig,
+        build_config: &'a BuildConfig,
         profiles: &'a Profiles,
         extra_compiler_args: Option<(Unit<'a>, Vec<String>)>,
     ) -> CargoResult<Context<'a, 'cfg>> {

diff --git a/src/cargo/ops/cargo_clean.rs b/src/cargo/ops/cargo_clean.rs
index 72b1966990b19521208a1c8169ec3b32940cecd5..a120ef6c015e9d06b1032965ffd805adb20d39f7 100644 (file)
--- a/src/cargo/ops/cargo_clean.rs
+++ b/src/cargo/ops/cargo_clean.rs
@@ -86,7 +86,7 @@ pub fn clean(ws: &Workspace, opts: &CleanOptions) -> CargoResult<()> {
         &resolve,
         &packages,
         opts.config,
-        build_config,
+        &build_config,
         profiles,
         None,
     )?;

diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index cbf03a71b1cda09c230c32e00c781a0562e12913..53e19723f8551b039dcc6e24bc5dcad71d2c649f 100644 (file)
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -421,7 +421,7 @@ pub fn compile_ws<'a>(
             &resolve_with_overrides,
             &packages,
             config,
-            build_config,
+            &build_config,
             profiles,
             extra_compiler_args,
         )?;