diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-19T17·55+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-19T17·55+0100 |
commit | 867055133d3f487e52dd44149f76347c2c28bf10 (patch) | |
tree | c367803ad94f024b0052727a2c7a037af169169a /third_party/nix/src/libexpr/primops/context.cc | |
parent | c6a31838cd7e88ebcb01422b329a499d04ab4b6b (diff) |
style(3p/nix): Add braces around single-line conditionals r/771
These were not caught by the previous clang-tidy invocation, but were instead sorted out using amber[0] as such: ambr --regex 'if (\(.+\))\s([a-z].*;)' 'if $1 { $2 }' [0]: https://github.com/dalance/amber
Diffstat (limited to 'third_party/nix/src/libexpr/primops/context.cc')
-rw-r--r-- | third_party/nix/src/libexpr/primops/context.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/third_party/nix/src/libexpr/primops/context.cc b/third_party/nix/src/libexpr/primops/context.cc index 13faeef8ce9c..1ae3219f2c61 100644 --- a/third_party/nix/src/libexpr/primops/context.cc +++ b/third_party/nix/src/libexpr/primops/context.cc @@ -111,7 +111,9 @@ static void prim_getContext(EvalState& state, const Pos& pos, Value** args, for (const auto& info : contextInfos) { auto& infoVal = *state.allocAttr(v, state.symbols.create(info.first)); state.mkAttrs(infoVal, 3); - if (info.second.path) mkBool(*state.allocAttr(infoVal, sPath), true); + if (info.second.path) { + mkBool(*state.allocAttr(infoVal, sPath), true); + } if (info.second.allOutputs) mkBool(*state.allocAttr(infoVal, sAllOutputs), true); if (!info.second.outputs.empty()) { @@ -147,11 +149,15 @@ static void prim_appendContext(EvalState& state, const Pos& pos, Value** args, 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); + if (!settings.readOnlyMode) { + state.store->ensurePath(i.name); + } state.forceAttrs(*i.value, *i.pos); auto iter = i.value->attrs->find(sPath); if (iter != i.value->attrs->end()) { - if (state.forceBool(*iter->value, *iter->pos)) context.insert(i.name); + if (state.forceBool(*iter->value, *iter->pos)) { + context.insert(i.name); + } } iter = i.value->attrs->find(sAllOutputs); |