diff options
| author | Jade Lovelace <lix@jade.fyi> | 2024-03-17 19:14:18 -0700 |
|---|---|---|
| committer | Jade Lovelace <lix@jade.fyi> | 2024-03-17 20:17:19 -0700 |
| commit | 61e21b25576f7f3491f6a837bf59d8b44c6897a0 (patch) | |
| tree | 3f62d83b3bab84afcf1011b5c2353226b84313b3 /src/nix/upgrade-nix.cc | |
| parent | 706cee5c493b39e25bdb0add55d2e1771dc31696 (diff) | |
Delete hasPrefix and hasSuffix from the codebase
These now have equivalents in the standard lib in C++20. This change was
performed with a custom clang-tidy check which I will submit later.
Executed like so:
ninja -C build && run-clang-tidy -checks='-*,nix-*' -load=build/libnix-clang-tidy.so -p .. -fix ../tests | tee -a clang-tidy-result
Change-Id: I62679e315ff9e7ce72a40b91b79c3e9fc01b27e9
Diffstat (limited to 'src/nix/upgrade-nix.cc')
| -rw-r--r-- | src/nix/upgrade-nix.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc index d238456db..af219c1b9 100644 --- a/src/nix/upgrade-nix.cc +++ b/src/nix/upgrade-nix.cc @@ -115,7 +115,7 @@ struct CmdUpgradeNix : MixDryRun, StoreCommand printInfo("found Nix in '%s'", where); - if (hasPrefix(where, "/run/current-system")) + if (where.starts_with("/run/current-system")) throw Error("Nix on NixOS must be upgraded via 'nixos-rebuild'"); Path profileDir = dirOf(where); @@ -129,7 +129,7 @@ struct CmdUpgradeNix : MixDryRun, StoreCommand Path userEnv = canonPath(profileDir, true); if (baseNameOf(where) != "bin" || - !hasSuffix(userEnv, "user-environment")) + !userEnv.ends_with("user-environment")) throw Error("directory '%s' does not appear to be part of a Nix profile", where); if (!store->isValidPath(store->parseStorePath(userEnv))) |