diff options
| author | Qyriad <qyriad@qyriad.me> | 2024-07-07 05:47:41 -0600 |
|---|---|---|
| committer | Qyriad <qyriad@qyriad.me> | 2024-07-08 17:52:02 +0000 |
| commit | accfd8aa9d786831e6e08e92162891e99e11c08a (patch) | |
| tree | 6204766bdc72f73c87d454f30a106c012259c2e0 /src/libexpr/get-drvs.cc | |
| parent | d461cc1d7b2f489c3886f147166ba5b5e0e37541 (diff) | |
libexpr: stop lying about DrvInfo's constness
DrvInfo's query methods all use mutable fields to cache, but like.
that's basically the entire interface for DrvInfo. Not only that, but
these formerly-const-marked functions can even throw due to eval errors!
Changing this only required removing some `const` markers in nix-env,
and changing a single inline `queryInstalled()` call to be an lvalue
instead.
Change-Id: I796807118f3b35b0e93668b5e28210d9e521b2ae
Diffstat (limited to 'src/libexpr/get-drvs.cc')
| -rw-r--r-- | src/libexpr/get-drvs.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index 8c8e142b8..b199cd09e 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -45,7 +45,7 @@ DrvInfo::DrvInfo(EvalState & state, ref<Store> store, const std::string & drvPat } -std::string DrvInfo::queryName() const +std::string DrvInfo::queryName() { if (name == "" && attrs) { auto i = attrs->find(state->sName); @@ -56,7 +56,7 @@ std::string DrvInfo::queryName() const } -std::string DrvInfo::querySystem() const +std::string DrvInfo::querySystem() { if (system == "" && attrs) { auto i = attrs->find(state->sSystem); @@ -66,7 +66,7 @@ std::string DrvInfo::querySystem() const } -std::optional<StorePath> DrvInfo::queryDrvPath() const +std::optional<StorePath> DrvInfo::queryDrvPath() { if (!drvPath && attrs) { Bindings::iterator i = attrs->find(state->sDrvPath); @@ -80,7 +80,7 @@ std::optional<StorePath> DrvInfo::queryDrvPath() const } -StorePath DrvInfo::requireDrvPath() const +StorePath DrvInfo::requireDrvPath() { if (auto drvPath = queryDrvPath()) return *drvPath; @@ -88,7 +88,7 @@ StorePath DrvInfo::requireDrvPath() const } -StorePath DrvInfo::queryOutPath() const +StorePath DrvInfo::queryOutPath() { if (!outPath && attrs) { Bindings::iterator i = attrs->find(state->sOutPath); @@ -164,7 +164,7 @@ DrvInfo::Outputs DrvInfo::queryOutputs(bool withPaths, bool onlyOutputsToInstall } -std::string DrvInfo::queryOutputName() const +std::string DrvInfo::queryOutputName() { if (outputName == "" && attrs) { Bindings::iterator i = attrs->find(state->sOutputName); |