From 867055133d3f487e52dd44149f76347c2c28bf10 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 19 May 2020 18:55:58 +0100 Subject: style(3p/nix): Add braces around single-line conditionals 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 --- third_party/nix/src/libstore/export-import.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libstore/export-import.cc') diff --git a/third_party/nix/src/libstore/export-import.cc b/third_party/nix/src/libstore/export-import.cc index f0af044355ff..930ff90d269e 100644 --- a/third_party/nix/src/libstore/export-import.cc +++ b/third_party/nix/src/libstore/export-import.cc @@ -59,7 +59,9 @@ Paths Store::importPaths(Source& source, std::shared_ptr accessor, Paths res; while (true) { auto n = readNum(source); - if (n == 0) break; + if (n == 0) { + break; + } if (n != 1) throw Error( "input doesn't look like something created by 'nix-store --export'"); @@ -82,13 +84,17 @@ Paths Store::importPaths(Source& source, std::shared_ptr accessor, info.references = readStorePaths(*this, source); info.deriver = readString(source); - if (info.deriver != "") assertStorePath(info.deriver); + if (info.deriver != "") { + assertStorePath(info.deriver); + } info.narHash = hashString(htSHA256, *tee.source.data); info.narSize = tee.source.data->size(); // Ignore optional legacy signature. - if (readInt(source) == 1) readString(source); + if (readInt(source) == 1) { + readString(source); + } addToStore(info, tee.source.data, NoRepair, checkSigs, accessor); -- cgit 1.4.1