Cleanup

Author: edolstra

src/libstore/globals.cc

@@ -6,7 +6,6 @@
 #include "nix/util/abstract-setting-to-json.hh"
 #include "nix/util/compute-levels.hh"
 #include "nix/util/signals.hh"
-#include "nix/util/types.hh"
 
 #include <algorithm>
 #include <map>

src/libstore/include/nix/store/local-store.hh

@@ -34,7 +34,8 @@ struct OptimiseStats
     uint64_t bytesFreed = 0;
 };
 
-struct LocalBuildStoreConfig : virtual LocalFSStoreConfig {
+struct LocalBuildStoreConfig : virtual LocalFSStoreConfig
+{
 
 private:
     /**

src/libstore/local-store.cc

@@ -79,14 +79,12 @@ std::string LocalStoreConfig::doc()
 
 Path LocalBuildStoreConfig::getBuildDir() const
 {
-    if (settings.buildDir.get().has_value()) {
-        return *settings.buildDir.get();
-    }
-    if (buildDir.get().has_value()) {
-        return *buildDir.get();
-    }
-
-    return stateDir.get() + "/builds";
+    return
+        settings.buildDir.get().has_value()
+        ? *settings.buildDir.get()
+        : buildDir.get().has_value()
+        ? *buildDir.get()
+        : stateDir.get() + "/builds";
 }
 
 ref<Store> LocalStore::Config::openStore() const