diff options
Diffstat (limited to '')
-rw-r--r-- | third_party/nix/src/libexpr/primops/context.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/third_party/nix/src/libexpr/primops/context.cc b/third_party/nix/src/libexpr/primops/context.cc index fb8879ead16d..841a45c61c03 100644 --- a/third_party/nix/src/libexpr/primops/context.cc +++ b/third_party/nix/src/libexpr/primops/context.cc @@ -97,13 +97,12 @@ static void prim_getContext(EvalState& state, const Pos& pos, Value** args, ContextInfo{isPath, isAllOutputs, output.empty() ? Strings{} : Strings{std::move(output)}}); } else { - if (isPath) { + if (isPath) iter->second.path = true; - } else if (isAllOutputs) { + else if (isAllOutputs) iter->second.allOutputs = true; - } else { + else iter->second.outputs.emplace_back(std::move(output)); - } } } @@ -117,9 +116,8 @@ static void prim_getContext(EvalState& state, const Pos& pos, Value** args, if (info.second.path) { mkBool(*state.allocAttr(infoVal, sPath), true); } - if (info.second.allOutputs) { + if (info.second.allOutputs) mkBool(*state.allocAttr(infoVal, sAllOutputs), true); - } if (!info.second.outputs.empty()) { auto& outputsVal = *state.allocAttr(infoVal, state.sOutputs); state.mkList(outputsVal, info.second.outputs.size()); @@ -149,10 +147,9 @@ static void prim_appendContext(EvalState& state, const Pos& pos, Value** args, auto sAllOutputs = state.symbols.Create("allOutputs"); for (const auto& attr_iter : *args[1]->attrs) { const Attr* i = &attr_iter.second; // TODO(tazjin): get rid of this - if (!state.store->isStorePath(i->name)) { + if (!state.store->isStorePath(i->name)) throw EvalError("Context key '%s' is not a store path, at %s", i->name, i->pos); - } if (!settings.readOnlyMode) { state.store->ensurePath(i->name); } |