diff options
| author | eldritch horrors <pennae@lix.systems> | 2024-03-08 09:52:29 +0100 |
|---|---|---|
| committer | eldritch horrors <pennae@lix.systems> | 2024-03-10 03:18:32 -0600 |
| commit | 06764118ea1327973ead981ee204e8c0c2bf867e (patch) | |
| tree | 82b9703980a4e28a2dd0638d10d2729f334076cc /src/libexpr/eval.cc | |
| parent | b667b4cded1b9d974157f27761d8648b372d27bf (diff) | |
remove ExprAttrs::AttrDef::inherited
it's no longer widely used and has a rather confusing meaning now that
inherit-from is handled very differently.
(cherry picked from commit 1cd87b7042d14aae1fafa47b1c28db4c5bd20de7)
Change-Id: I90bbebddf06762960d8ca4f621cf042ce8ae83f9
Diffstat (limited to 'src/libexpr/eval.cc')
| -rw-r--r-- | src/libexpr/eval.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 9fa036d6c..1739a04fa 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1251,7 +1251,7 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v) Displacement displ = 0; for (auto & i : attrs) { Value * vAttr; - if (hasOverrides && !i.second.inherited()) { + if (hasOverrides && i.second.kind != AttrDef::Kind::Inherited) { vAttr = state.allocValue(); mkThunk(*vAttr, *i.second.chooseByKind(&env2, &env, inheritEnv), i.second.e); } else |