From 72fc2fd27e8ca9ddd6dad7f1c8f508e115aa2b60 Mon Sep 17 00:00:00 2001 From: Kane York Date: Sat, 1 Aug 2020 15:32:00 -0700 Subject: fix(3p/nix): revert "apply all clang-tidy fixes" This reverts commit ef54f5da9fa30b5c302f2a49595ee5d041f9706a. 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 Tested-by: BuildkiteCI --- third_party/nix/src/nix-daemon/nix-daemon-proto.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/nix-daemon/nix-daemon-proto.cc') diff --git a/third_party/nix/src/nix-daemon/nix-daemon-proto.cc b/third_party/nix/src/nix-daemon/nix-daemon-proto.cc index 58f7754386..63c68ed1e5 100644 --- a/third_party/nix/src/nix-daemon/nix-daemon-proto.cc +++ b/third_party/nix/src/nix-daemon/nix-daemon-proto.cc @@ -22,6 +22,7 @@ namespace nix::daemon { using ::grpc::Status; +using ::nix::proto::BuildStatus; using ::nix::proto::PathInfo; using ::nix::proto::StorePath; using ::nix::proto::StorePaths; @@ -84,7 +85,7 @@ struct RetrieveRegularNARSink : ParseSink { class WorkerServiceImpl final : public WorkerService::Service { public: - explicit WorkerServiceImpl(nix::Store& store) : store_(&store) {} + WorkerServiceImpl(nix::Store& store) : store_(&store) {} Status IsValidPath(grpc::ServerContext* context, const StorePath* request, nix::proto::IsValidPathResponse* response) override { @@ -394,8 +395,8 @@ class WorkerServiceImpl final : public WorkerService::Service { PathSet will_substitute; PathSet unknown; // TODO(grfn): Switch to concrete size type - unsigned long long download_size = 0; - unsigned long long nar_size = 0; + unsigned long long download_size; + unsigned long long nar_size; store_->queryMissing(targets, will_build, will_substitute, unknown, download_size, nar_size); -- cgit 1.4.1