3 files changed, 7 insertions, 4 deletions
diff --git a/third_party/nix/src/libstore/download.cc b/third_party/nix/src/libstore/download.cc
index f30642d69d..e73181e731 100644
--- a/third_party/nix/src/libstore/download.cc
+++ b/third_party/nix/src/libstore/download.cc
@@ -835,7 +835,7 @@ void Downloader::download(DownloadRequest&& request, Sink& sink) {
         state.wait(state->avail);
       }
 
-      chunk = std::move(state->data);
+      chunk = state->data;
 
       state->request.notify_one();
     }
diff --git a/third_party/nix/src/libstore/local-store.cc b/third_party/nix/src/libstore/local-store.cc
index 995bc4f998..5ae38535d8 100644
--- a/third_party/nix/src/libstore/local-store.cc
+++ b/third_party/nix/src/libstore/local-store.cc
@@ -73,6 +73,9 @@ LocalStore::LocalStore(const Params& params)
     }
   }
 
+  // TODO(kanepyork): migrate to external constructor, this bypasses virtual
+  // dispatch
+  // NOLINTNEXTLINE clang-analyzer-optin.cplusplus.VirtualCall
   createUser(getUserName(), getuid());
 
   /* Optionally, create directories and set permissions for a
diff --git a/third_party/nix/src/tests/language-tests.cc b/third_party/nix/src/tests/language-tests.cc
index 98f2927911..9fb453e5e5 100644
--- a/third_party/nix/src/tests/language-tests.cc
+++ b/third_party/nix/src/tests/language-tests.cc
@@ -212,13 +212,13 @@ TEST_P(EvalSuccessTest, Fails) {
   EvalState state({}, ref<Store>(store));
   auto path = GetParam();
 
-  Expr* expr;
-  EXPECT_NO_THROW(expr = state.parseExprFromFile(GetParam().string()))
+  Expr* expr = nullptr;
+  ASSERT_NO_THROW(expr = state.parseExprFromFile(GetParam().string()))
       << path.stem().string() << ": should parse successfully";
 
   Value result;
 
-  EXPECT_NO_THROW({
+  ASSERT_NO_THROW({
     state.eval(expr, result);
     state.forceValueDeep(result);
   }) << path.stem().string()