diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-19T19·47+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-19T19·51+0100 |
commit | 39087321811e81e26a1a47d6967df1088dcf0e95 (patch) | |
tree | 57110be423eeb7869e9960466f4b17c0ea7cd961 /third_party/nix/src/libexpr/common-eval-args.cc | |
parent | cf40d08908ede4061eb15513b770c98877844b8b (diff) |
style(3p/nix): Final act in the brace-wrapping saga r/777
This last change set was generated by a full clang-tidy run (including compilation): clang-tidy -p ~/projects/nix-build/ \ -checks=-*,readability-braces-around-statements -fix src/*/*.cc Actually running clang-tidy requires some massaging to make it play nice with Nix + meson, I'll be adding a wrapper or something for that soon.
Diffstat (limited to 'third_party/nix/src/libexpr/common-eval-args.cc')
-rw-r--r-- | third_party/nix/src/libexpr/common-eval-args.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/third_party/nix/src/libexpr/common-eval-args.cc b/third_party/nix/src/libexpr/common-eval-args.cc index 8cd4bc56e592..7af4d6b276db 100644 --- a/third_party/nix/src/libexpr/common-eval-args.cc +++ b/third_party/nix/src/libexpr/common-eval-args.cc @@ -36,11 +36,12 @@ Bindings* MixEvalArgs::getAutoArgs(EvalState& state) { Bindings* res = state.allocBindings(autoArgs.size()); for (auto& i : autoArgs) { Value* v = state.allocValue(); - if (i.second[0] == 'E') + if (i.second[0] == 'E') { state.mkThunk_( *v, state.parseExprFromString(string(i.second, 1), absPath("."))); - else + } else { mkString(*v, string(i.second, 1)); + } res->push_back(Attr(state.symbols.create(i.first), v)); } res->sort(); @@ -55,8 +56,9 @@ Path lookupFileArg(EvalState& state, string s) { } else if (s.size() > 2 && s.at(0) == '<' && s.at(s.size() - 1) == '>') { Path p = s.substr(1, s.size() - 2); return state.findFile(p); - } else + } else { return absPath(s); + } } } // namespace nix |