diff options
author | Vincent Ambo <mail@tazj.in> | 2020-08-21T03·00+0100 |
---|---|---|
committer | tazjin <mail@tazj.in> | 2020-08-23T11·58+0000 |
commit | 1cf11317cac2c11d20b2324d4283814f1351c1a3 (patch) | |
tree | 5a77610f94b0b8fd60bf64c1ca765b05ab8a6fd6 /third_party/nix/src/build-remote | |
parent | 1443298657156107704b5d9fcfa7356ee8fa8789 (diff) |
refactor(tvix/libutil): Mark single-argument constructors explicit r/1704
This is the clang-tidy lint 'google-explicit-constructor'. There's a whole bunch of breakage that was introduced by this, and we had to opt out a few types of this (esp. the string formatting crap). In some cases minor other changes have been done to keep the code working, instead of converting between types (e.g. an explicit comparison operator implementation for nix::Pid). Change-Id: I12e1ca51a6bc2c882dba81a2526b9729d26988e7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1832 Tested-by: BuildkiteCI Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'third_party/nix/src/build-remote')
-rw-r--r-- | third_party/nix/src/build-remote/build-remote.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party/nix/src/build-remote/build-remote.cc b/third_party/nix/src/build-remote/build-remote.cc index 60878e2e6eb8..00bd833ac38e 100644 --- a/third_party/nix/src/build-remote/build-remote.cc +++ b/third_party/nix/src/build-remote/build-remote.cc @@ -109,8 +109,8 @@ static int _main(int argc, char* argv[]) { mkdir(currentLoad.c_str(), 0777); while (true) { - bestSlotLock = -1; - AutoCloseFD lock = openLockFile(currentLoad + "/main-lock", true); + bestSlotLock = AutoCloseFD(-1); + AutoCloseFD lock(openLockFile(currentLoad + "/main-lock", true)); lockFile(lock.get(), ltWrite, true); bool rightType = false; @@ -177,7 +177,7 @@ static int _main(int argc, char* argv[]) { futimens(bestSlotLock.get(), nullptr); - lock = -1; + lock = AutoCloseFD(-1); try { DLOG(INFO) << "connecting to '" << bestMachine->storeUri << "'"; @@ -240,7 +240,7 @@ static int _main(int argc, char* argv[]) { substitute); } - uploadLock = -1; + uploadLock = AutoCloseFD(-1); BasicDerivation drv( readDerivation(store->realStoreDir + "/" + baseNameOf(drvPath))); |