diff options
| author | Kane York <kanepyork@gmail.com> | 2020-07-24T01·59-0700 |
|---|---|---|
| committer | kanepyork <rikingcoding@gmail.com> | 2020-07-24T02·40+0000 |
| commit | 3ce4a6cc18b233da69b5e2e193ba88677baed34f (patch) | |
| tree | 01c6fdc20745b9c68086b9590e21373171a40274 /third_party | |
| parent | fba4d145f8e8945e9fd2438e14075f3945da9fe3 (diff) | |
fix(3p/nix): fix more clang-tidy warnings r/1451
Change-Id: I1e8a4852ffa450c552a4cdfc709554799854934c Reviewed-on: https://cl.tvl.fyi/c/depot/+/1416 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/nix/src/libstore/download.cc | 2 | ||||
| -rw-r--r-- | third_party/nix/src/libstore/local-store.cc | 3 | ||||
| -rw-r--r-- | third_party/nix/src/tests/language-tests.cc | 6 |
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 f30642d69daf..e73181e73109 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 995bc4f998b4..5ae38535d841 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 98f2927911b2..9fb453e5e537 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() |