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

fix(3p/nix): revert "apply all clang-tidy fixes"

Browse source 
This reverts commit ef54f5da9f.

Resolved conflicts:
	third_party/nix/src/libexpr/eval.cc
	third_party/nix/src/libstore/builtins/fetchurl.cc
	third_party/nix/src/libstore/references.cc
	third_party/nix/src/libutil/hash.cc
	third_party/nix/src/nix-daemon/nix-daemon.cc

Change-Id: Ib9cf6e96a79a23bde3983579ced3f92e530cb011
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1547
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Kane York 2020-08-01 15:32:00 -07:00 • committed by kanepyork
parent cc3c45f739
commit 72fc2fd27e
64 changed files with 479 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

16
third_party/nix/src/libstore/nar-info-disk-cache.cc vendored
View file

@ -55,10 +55,10 @@ class NarInfoDiskCacheImpl final : public NarInfoDiskCache {
const int purgeInterval = 24 * 3600;
struct Cache {
int id{};
int id;
Path storeDir;
bool wantMassQuery{};
int priority{};
bool wantMassQuery;
int priority;
};
struct State {
@ -164,9 +164,8 @@ class NarInfoDiskCacheImpl final : public NarInfoDiskCache {
static_cast<int64_t>(wantMassQuery))(priority)
.exec();
assert(sqlite3_changes(state->db) == 1);
state->caches[uri] =
Cache{static_cast<int>(sqlite3_last_insert_rowid(state->db)),
storeDir, wantMassQuery, priority};
state->caches[uri] = Cache{(int)sqlite3_last_insert_rowid(state->db),
storeDir, wantMassQuery, priority};
});
}
@ -182,9 +181,8 @@ class NarInfoDiskCacheImpl final : public NarInfoDiskCache {
return false;
}
state->caches.emplace(
uri, Cache{static_cast<int>(queryCache.getInt(0)),
queryCache.getStr(1), queryCache.getInt(2) != 0,
static_cast<int>(queryCache.getInt(3))});
uri, Cache{(int)queryCache.getInt(0), queryCache.getStr(1),
queryCache.getInt(2) != 0, (int)queryCache.getInt(3)});
}
auto& cache(getCache(*state, uri));