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

style(3p/nix): Add braces around single-line conditionals

Browse source 
These were not caught by the previous clang-tidy invocation, but were
instead sorted out using amber[0] as such:

    ambr --regex 'if (\(.+\))\s([a-z].*;)' 'if $1 { $2 }'

[0]: https://github.com/dalance/amber
This commit is contained in:
Vincent Ambo 2020-05-19 18:55:58 +01:00
parent c6a31838cd
commit 867055133d
97 changed files with 2223 additions and 753 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

@ -23,7 +23,9 @@ class HttpBinaryCacheStore : public BinaryCacheStore {
public:
HttpBinaryCacheStore(const Params& params, const Path& _cacheUri)
: BinaryCacheStore(params), cacheUri(_cacheUri) {
if (cacheUri.back() == '/') cacheUri.pop_back();
if (cacheUri.back() == '/') {
cacheUri.pop_back();
}
diskCache = getNarInfoDiskCache();
}
@ -57,7 +59,9 @@ class HttpBinaryCacheStore : public BinaryCacheStore {
void checkEnabled() {
auto state(_state.lock());
if (state->enabled) return;
if (state->enabled) {
return;
}
if (std::chrono::steady_clock::now() > state->disabledUntil) {
state->enabled = true;
DLOG(INFO) << "re-enabling binary cache '" << getUri() << "'";