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

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

@ -87,7 +87,7 @@ void BinaryCacheStore::getFile(const std::string& path, Sink& sink) {
}
}});
auto data = promise.get_future().get();
sink(reinterpret_cast<unsigned char*>(data->data()), data->size());
sink((unsigned char*)data->data(), data->size());
}
std::shared_ptr<std::string> BinaryCacheStore::getFile(
@ -205,9 +205,7 @@ void BinaryCacheStore::addToStore(const ValidPathInfo& info,
.count();
DLOG(INFO) << "copying path '" << narInfo->path << "' (" << narInfo->narSize
<< " bytes, compressed "
<< ((1.0 -
static_cast<double>(narCompressed->size()) / nar->size()) *
100.0)
<< ((1.0 - (double)narCompressed->size() / nar->size()) * 100.0)
<< "% in " << duration << "ms) to binary cache";
/* Atomically write the NAR file. */
@ -289,8 +287,9 @@ void BinaryCacheStore::queryPathInfoUncached(
stats.narInfoRead++;
(*callbackPtr)(std::shared_ptr<ValidPathInfo>(
std::make_shared<NarInfo>(*this, *data, narInfoFile)));
(*callbackPtr)(
(std::shared_ptr<ValidPathInfo>)std::make_shared<NarInfo>(
*this, *data, narInfoFile));
} catch (...) {
callbackPtr->rethrow();
@ -354,9 +353,7 @@ void BinaryCacheStore::addSignatures(const Path& storePath,
when addSignatures() is called sequentially on a path, because
S3 might return an outdated cached version. */
// TODO(kanepyork): what is going on here
auto narInfo = make_ref<NarInfo>(const_cast<NarInfo&>(
dynamic_cast<const NarInfo&>(*queryPathInfo(storePath))));
auto narInfo = make_ref<NarInfo>((NarInfo&)*queryPathInfo(storePath));
narInfo->sigs.insert(sigs.begin(), sigs.end());