From c7be956f3f5e2b50e3af72a6170a455f20b1643b Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 19 May 2020 04:51:01 +0100 Subject: style(3p/nix/libexpr): Reformat with clang-format --- third_party/nix/src/libexpr/eval.cc | 2 +- third_party/nix/src/libexpr/get-drvs.cc | 2 +- third_party/nix/src/libexpr/primops.cc | 4 ++-- third_party/nix/src/libexpr/primops/fetchGit.cc | 2 +- third_party/nix/src/libexpr/primops/fetchMercurial.cc | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) (limited to 'third_party/nix/src') diff --git a/third_party/nix/src/libexpr/eval.cc b/third_party/nix/src/libexpr/eval.cc index 5aefc120e2c7..f33735cc585d 100644 --- a/third_party/nix/src/libexpr/eval.cc +++ b/third_party/nix/src/libexpr/eval.cc @@ -1,4 +1,5 @@ #include "eval.hh" +#include #include #include #include @@ -16,7 +17,6 @@ #include "json.hh" #include "store-api.hh" #include "util.hh" -#include #if HAVE_BOEHMGC diff --git a/third_party/nix/src/libexpr/get-drvs.cc b/third_party/nix/src/libexpr/get-drvs.cc index b25556b34c07..fdf3494ed26a 100644 --- a/third_party/nix/src/libexpr/get-drvs.cc +++ b/third_party/nix/src/libexpr/get-drvs.cc @@ -1,10 +1,10 @@ #include "get-drvs.hh" +#include #include #include #include "derivations.hh" #include "eval-inline.hh" #include "util.hh" -#include namespace nix { diff --git a/third_party/nix/src/libexpr/primops.cc b/third_party/nix/src/libexpr/primops.cc index 05fa9c4828b3..23eaba57972d 100644 --- a/third_party/nix/src/libexpr/primops.cc +++ b/third_party/nix/src/libexpr/primops.cc @@ -1,5 +1,6 @@ #include "primops.hh" #include +#include #include #include #include @@ -19,7 +20,6 @@ #include "util.hh" #include "value-to-json.hh" #include "value-to-xml.hh" -#include namespace nix { @@ -508,7 +508,7 @@ static void prim_trace(EvalState& state, const Pos& pos, Value** args, if (args[0]->type == tString) { DLOG(INFO) << "trace: " << args[0]->string.s; } else { - DLOG(INFO)<< "trace: " << *args[0]; + DLOG(INFO) << "trace: " << *args[0]; } state.forceValue(*args[1]); v = *args[1]; diff --git a/third_party/nix/src/libexpr/primops/fetchGit.cc b/third_party/nix/src/libexpr/primops/fetchGit.cc index 07a0770a3fca..21994db07616 100644 --- a/third_party/nix/src/libexpr/primops/fetchGit.cc +++ b/third_party/nix/src/libexpr/primops/fetchGit.cc @@ -1,3 +1,4 @@ +#include #include #include #include @@ -7,7 +8,6 @@ #include "pathlocks.hh" #include "primops.hh" #include "store-api.hh" -#include using namespace std::string_literals; diff --git a/third_party/nix/src/libexpr/primops/fetchMercurial.cc b/third_party/nix/src/libexpr/primops/fetchMercurial.cc index 677855e85369..17fdb2b31897 100644 --- a/third_party/nix/src/libexpr/primops/fetchMercurial.cc +++ b/third_party/nix/src/libexpr/primops/fetchMercurial.cc @@ -141,7 +141,8 @@ HgInfo exportMercurial(ref store, const std::string& uri, hgInfo.storePath = json["storePath"]; if (store->isValidPath(hgInfo.storePath)) { - DLOG(INFO) << "using cached Mercurial store path '" << hgInfo.storePath << "'"; + DLOG(INFO) << "using cached Mercurial store path '" << hgInfo.storePath + << "'"; return hgInfo; } -- cgit 1.4.1