refactor(tvix/glue): create environment_vars Vec at the end
Prevent code in this function from accessing the Vec, realize it only when returning the BuildRequest struct. Change-Id: I385c1adca552c9cb261cd70c5ca3ec45f0d7a9c3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10521 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
This commit is contained in:
parent
7f030fe265
commit
9abe735061
1 changed files with 7 additions and 8 deletions
|
@ -83,13 +83,6 @@ where
|
||||||
.map(|(k, v)| (k.clone(), Bytes::from(v.to_vec()))),
|
.map(|(k, v)| (k.clone(), Bytes::from(v.to_vec()))),
|
||||||
);
|
);
|
||||||
|
|
||||||
// Turn this into a sorted-by-key Vec<EnvVar>.
|
|
||||||
let environment_vars = Vec::from_iter(
|
|
||||||
environment_vars
|
|
||||||
.into_iter()
|
|
||||||
.map(|(k, v)| EnvVar { key: k, value: v }),
|
|
||||||
);
|
|
||||||
|
|
||||||
// Produce inputs. As we refer to the contents here, not just plain store path strings,
|
// Produce inputs. As we refer to the contents here, not just plain store path strings,
|
||||||
// we need to perform lookups.
|
// we need to perform lookups.
|
||||||
// FUTUREWORK: should we also model input_derivations and input_sources with StorePath?
|
// FUTUREWORK: should we also model input_derivations and input_sources with StorePath?
|
||||||
|
@ -145,7 +138,13 @@ where
|
||||||
BuildRequest {
|
BuildRequest {
|
||||||
command_args,
|
command_args,
|
||||||
outputs: output_paths,
|
outputs: output_paths,
|
||||||
environment_vars,
|
|
||||||
|
// Turn this into a sorted-by-key Vec<EnvVar>.
|
||||||
|
environment_vars: Vec::from_iter(
|
||||||
|
environment_vars
|
||||||
|
.into_iter()
|
||||||
|
.map(|(key, value)| EnvVar { key, value }),
|
||||||
|
),
|
||||||
inputs,
|
inputs,
|
||||||
inputs_dir: nix_compat::store_path::STORE_DIR.into(),
|
inputs_dir: nix_compat::store_path::STORE_DIR.into(),
|
||||||
constraints,
|
constraints,
|
||||||
|
|
Loading…
Reference in a new issue