maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix): Apply clang-tidy's modernize-* fixes

Browse source 
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).
This commit is contained in:
Vincent Ambo 2020-05-20 04:33:07 +01:00
parent fed31b2c9b
commit d331d3a0b5
59 changed files with 349 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

8
third_party/nix/src/libstore/http-binary-cache-store.cc vendored
View file

@ -1,3 +1,5 @@
#include <utility>
#include <glog/logging.h>
#include "binary-cache-store.hh"
@ -21,8 +23,8 @@ class HttpBinaryCacheStore : public BinaryCacheStore {
Sync<State> _state;
public:
HttpBinaryCacheStore(const Params& params, const Path& _cacheUri)
: BinaryCacheStore(params), cacheUri(_cacheUri) {
HttpBinaryCacheStore(const Params& params, Path _cacheUri)
: BinaryCacheStore(params), cacheUri(std::move(_cacheUri)) {
if (cacheUri.back() == '/') {
cacheUri.pop_back();
}
@ -157,7 +159,7 @@ static RegisterStoreImplementation regStore(
std::string(uri, 0, 8) != "https://" &&
(getEnv("_NIX_FORCE_HTTP_BINARY_CACHE_STORE") != "1" ||
std::string(uri, 0, 7) != "file://")) {
return 0;
return nullptr;
}
auto store = std::make_shared<HttpBinaryCacheStore>(params, uri);
store->init();