From 09cbc431cca08be891e5e792ceda2a34956b2fc8 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 19 May 2020 18:01:12 +0100 Subject: fix(3p/nix): Fix incorrectly braced conditionals and loops Fixes mistakes introduced by clang-tidy in the previous commit. --- third_party/nix/src/libexpr/primops.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'third_party/nix/src/libexpr/primops.cc') diff --git a/third_party/nix/src/libexpr/primops.cc b/third_party/nix/src/libexpr/primops.cc index 98a6f56dfdf3..3e11d6589f6a 100644 --- a/third_party/nix/src/libexpr/primops.cc +++ b/third_party/nix/src/libexpr/primops.cc @@ -1966,9 +1966,9 @@ static void prim_concatStringSep(EvalState& state, const Pos& pos, Value** args, if (first) { first = false; } else { - res + res += sep; } - += sep; + res += state.coerceToString(pos, *args[1]->listElems()[n], context); } @@ -2103,9 +2103,8 @@ void fetch(EvalState& state, const Pos& pos, Value** args, Value& v, throw EvalError(format("'url' argument required, at %1%") % pos); } else { - request + request.uri = state.forceStringNoCtx(*args[0], pos); } - .uri = state.forceStringNoCtx(*args[0], pos); state.checkURI(request.uri); -- cgit 1.4.1