From 162b538912fc940b3c737634c23c99c574adf4ad Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 4 Dec 2023 11:27:39 -0500 Subject: [PATCH 1/2] Remove unused `thisArrow` variable --- src/hydra-queue-runner/build-remote.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc index baf35d86c..f1575170d 100644 --- a/src/hydra-queue-runner/build-remote.cc +++ b/src/hydra-queue-runner/build-remote.cc @@ -421,8 +421,6 @@ static void copyPathsFromRemote( void RemoteResult::updateWithBuildResult(const nix::BuildResult & buildResult) { - RemoteResult thisArrow; - startTime = buildResult.startTime; stopTime = buildResult.stopTime; timesBuilt = buildResult.timesBuilt; From 363604846adf27db017d2d599b373f1e0839dfd6 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 4 Dec 2023 11:31:05 -0500 Subject: [PATCH 2/2] Again, use `const` in for loop As requested by @teh. Was lost in merge with master, now added back. --- src/hydra-queue-runner/build-remote.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc index f1575170d..73f46a535 100644 --- a/src/hydra-queue-runner/build-remote.cc +++ b/src/hydra-queue-runner/build-remote.cc @@ -230,7 +230,7 @@ static BasicDerivation sendInputs( { BasicDerivation basicDrv(*step.drv); - for (auto & [drvPath, node] : step.drv->inputDrvs.map) { + for (const auto & [drvPath, node] : step.drv->inputDrvs.map) { auto drv2 = localStore.readDerivation(drvPath); for (auto & name : node.value) { if (auto i = get(drv2.outputs, name)) {