From 11a7cbdb1f5c6f7357c54bae68c5a7b7d844d53e Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Sat, 14 Apr 2018 11:37:13 +0200 Subject: [PATCH] Let Context store BuildConfig by reference --- src/cargo/core/compiler/context/mod.rs | 4 ++-- src/cargo/ops/cargo_clean.rs | 2 +- src/cargo/ops/cargo_compile.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cargo/core/compiler/context/mod.rs b/src/cargo/core/compiler/context/mod.rs index f3d1e6d18..8992cf719 100644 --- 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, BuildDeps>, pub fingerprints: HashMap, Arc>, pub compiled: HashSet>, - pub build_config: BuildConfig, + pub build_config: &'a BuildConfig, pub build_scripts: HashMap, Arc>, pub links: Links<'a>, pub used_in_plugin: HashSet>, @@ -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)>, ) -> CargoResult> { diff --git a/src/cargo/ops/cargo_clean.rs b/src/cargo/ops/cargo_clean.rs index 72b196699..a120ef6c0 100644 --- 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 cbf03a71b..53e19723f 100644 --- 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, )?; -- 2.39.5