mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix): Use absl::btree_map for BasicDerivation's env

Browse source 
Change-Id: I111a9a268debea322f23fdced3bed9ff3e8ed3b3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1685
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2020-08-06 03:34:49 +01:00 committed by tazjin
parent 3ec3661678
commit 6a97206ceb
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
third_party/nix/src/libstore/derivations.cc vendored
View file

@ -50,8 +50,9 @@ BasicDerivation BasicDerivation::from_proto(
result.args.insert(result.args.end(), proto_derivation->args().begin(), result.args.insert(result.args.end(), proto_derivation->args().begin(),
proto_derivation->args().end()); proto_derivation->args().end());
result.env.insert(proto_derivation->env().begin(), for (auto [k, v] : proto_derivation->env()) {
proto_derivation->env().end()); result.env.emplace(k, v);
}
return result; return result;
} }

2
third_party/nix/src/libstore/derivations.hh vendored
View file

@ -44,7 +44,7 @@ using DerivationOutputs = absl::btree_map<std::string, DerivationOutput>;
output IDs we are interested in. */ output IDs we are interested in. */
using DerivationInputs = absl::btree_map<Path, StringSet>; using DerivationInputs = absl::btree_map<Path, StringSet>;
using StringPairs = std::map<std::string, std::string>; using StringPairs = absl::btree_map<std::string, std::string>;
struct BasicDerivation { struct BasicDerivation {
DerivationOutputs outputs; /* keyed on symbolic IDs */ DerivationOutputs outputs; /* keyed on symbolic IDs */