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/nix-instantiate/nix-instantiate.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'third_party/nix/src/nix-instantiate/nix-instantiate.cc') diff --git a/third_party/nix/src/nix-instantiate/nix-instantiate.cc b/third_party/nix/src/nix-instantiate/nix-instantiate.cc index df97f23ef9c9..2630f5f9ebfc 100644 --- a/third_party/nix/src/nix-instantiate/nix-instantiate.cc +++ b/third_party/nix/src/nix-instantiate/nix-instantiate.cc @@ -163,7 +163,9 @@ static int _main(int argc, char** argv) { if (findFile) { for (auto& i : files) { Path p = state->findFile(i); - if (p == "") throw Error(format("unable to find '%1%'") % i); + if (p == "") { + throw Error(format("unable to find '%1%'") % i); + } std::cout << p << std::endl; } return 0; @@ -173,10 +175,9 @@ static int _main(int argc, char** argv) { Expr* e = state->parseStdin(); processExpr(*state, attrPaths, parseOnly, strict, autoArgs, evalOnly, outputKind, xmlOutputSourceLocation, e); - } else { - if + } else if (files.empty() && !fromArgs) { + files.push_back("./default.nix"); } - (files.empty() && !fromArgs) files.push_back("./default.nix"); for (auto& i : files) { Expr* e = fromArgs -- cgit 1.4.1