style(3p/nix/libexpr): Reformat with clang-format r/760

5 files changed, 7 insertions, 6 deletions

diff --git a/third_party/nix/src/libexpr/eval.cc b/third_party/nix/src/libexpr/eval.cc
index 5aefc120e2..f33735cc58 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 <glog/logging.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <unistd.h>
@@ -16,7 +17,6 @@
 #include "json.hh"
 #include "store-api.hh"
 #include "util.hh"
-#include <glog/logging.h>
 
 #if HAVE_BOEHMGC
 
diff --git a/third_party/nix/src/libexpr/get-drvs.cc b/third_party/nix/src/libexpr/get-drvs.cc
index b25556b34c..fdf3494ed2 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 <glog/logging.h>
 #include <cstring>
 #include <regex>
 #include "derivations.hh"
 #include "eval-inline.hh"
 #include "util.hh"
-#include <glog/logging.h>
 
 namespace nix {
 
diff --git a/third_party/nix/src/libexpr/primops.cc b/third_party/nix/src/libexpr/primops.cc
index 05fa9c4828..23eaba5797 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 <dlfcn.h>
+#include <glog/logging.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -19,7 +20,6 @@
 #include "util.hh"
 #include "value-to-json.hh"
 #include "value-to-xml.hh"
-#include <glog/logging.h>
 
 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 07a0770a3f..21994db076 100644
--- a/third_party/nix/src/libexpr/primops/fetchGit.cc
+++ b/third_party/nix/src/libexpr/primops/fetchGit.cc
@@ -1,3 +1,4 @@
+#include <glog/logging.h>
 #include <sys/time.h>
 #include <nlohmann/json.hpp>
 #include <regex>
@@ -7,7 +8,6 @@
 #include "pathlocks.hh"
 #include "primops.hh"
 #include "store-api.hh"
-#include <glog/logging.h>
 
 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 677855e853..17fdb2b318 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> 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;
     }