From d331d3a0b5c497a46e2636f308234be66566c04c Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 20 May 2020 04:33:07 +0100 Subject: refactor(3p/nix): Apply clang-tidy's modernize-* fixes This applies the modernization fixes listed here: https://clang.llvm.org/extra/clang-tidy/checks/list.html The 'modernize-use-trailing-return-type' fix was excluded due to my personal preference (more specifically, I think the 'auto' keyword is misleading in that position). --- third_party/nix/src/libstore/local-binary-cache-store.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libstore/local-binary-cache-store.cc') diff --git a/third_party/nix/src/libstore/local-binary-cache-store.cc b/third_party/nix/src/libstore/local-binary-cache-store.cc index 29c74cedd834..58ce7c091147 100644 --- a/third_party/nix/src/libstore/local-binary-cache-store.cc +++ b/third_party/nix/src/libstore/local-binary-cache-store.cc @@ -1,3 +1,5 @@ +#include + #include "binary-cache-store.hh" #include "globals.hh" #include "nar-info-disk-cache.hh" @@ -9,8 +11,8 @@ class LocalBinaryCacheStore : public BinaryCacheStore { Path binaryCacheDir; public: - LocalBinaryCacheStore(const Params& params, const Path& binaryCacheDir) - : BinaryCacheStore(params), binaryCacheDir(binaryCacheDir) {} + LocalBinaryCacheStore(const Params& params, Path binaryCacheDir) + : BinaryCacheStore(params), binaryCacheDir(std::move(binaryCacheDir)) {} void init() override; @@ -78,7 +80,7 @@ static RegisterStoreImplementation regStore( const Store::Params& params) -> std::shared_ptr { if (getEnv("_NIX_FORCE_HTTP_BINARY_CACHE_STORE") == "1" || std::string(uri, 0, 7) != "file://") { - return 0; + return nullptr; } auto store = std::make_shared(params, std::string(uri, 7)); -- cgit 1.4.1