diff options
| -rw-r--r-- | src/libexpr/flake/flake.cc | 16 | ||||
| -rw-r--r-- | src/nix/flake.cc | 4 | ||||
| -rw-r--r-- | src/nix/installables.cc | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index 6b98cfad2..a30637262 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -240,8 +240,8 @@ static Flake getFlake( edition = vInfo.attrs->get(sEpoch); if (edition) { - expectType(state, tInt, *(**edition).value, *(**edition).pos); - flake.edition = (**edition).value->integer; + expectType(state, tInt, *edition->value, *edition->pos); + flake.edition = edition->value->integer; if (flake.edition > 201909) throw Error("flake '%s' requires unsupported edition %d; please upgrade Nix", lockedRef, flake.edition); if (flake.edition < 201909) @@ -250,20 +250,20 @@ static Flake getFlake( throw Error("flake '%s' lacks attribute 'edition'", lockedRef); if (auto description = vInfo.attrs->get(state.sDescription)) { - expectType(state, tString, *(**description).value, *(**description).pos); - flake.description = (**description).value->string.s; + expectType(state, tString, *description->value, *description->pos); + flake.description = description->value->string.s; } auto sInputs = state.symbols.create("inputs"); - if (std::optional<Attr *> inputs = vInfo.attrs->get(sInputs)) - flake.inputs = parseFlakeInputs(state, (**inputs).value, *(**inputs).pos); + if (auto inputs = vInfo.attrs->get(sInputs)) + flake.inputs = parseFlakeInputs(state, inputs->value, *inputs->pos); auto sOutputs = state.symbols.create("outputs"); if (auto outputs = vInfo.attrs->get(sOutputs)) { - expectType(state, tLambda, *(**outputs).value, *(**outputs).pos); - flake.vOutputs = (**outputs).value; + expectType(state, tLambda, *outputs->value, *outputs->pos); + flake.vOutputs = outputs->value; if (flake.vOutputs->lambda.fun->matchAttrs) { for (auto & formal : flake.vOutputs->lambda.fun->formals->formals) { diff --git a/src/nix/flake.cc b/src/nix/flake.cc index 8945d8829..9c94c59fc 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -134,9 +134,9 @@ static void enumerateOutputs(EvalState & state, Value & vFlake, auto aOutputs = vFlake.attrs->get(state.symbols.create("outputs")); assert(aOutputs); - state.forceAttrs(*(*aOutputs)->value); + state.forceAttrs(*aOutputs->value); - for (auto & attr : *((*aOutputs)->value->attrs)) + for (auto & attr : *aOutputs->value->attrs) callback(attr.name, *attr.value, *attr.pos); } diff --git a/src/nix/installables.cc b/src/nix/installables.cc index 39ce9b38f..071edf432 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -330,9 +330,9 @@ Value * InstallableFlake::getFlakeOutputs(EvalState & state, const flake::Locked auto aOutputs = vFlake->attrs->get(state.symbols.create("outputs")); assert(aOutputs); - state.forceValue(*(*aOutputs)->value); + state.forceValue(*aOutputs->value); - return (*aOutputs)->value; + return aOutputs->value; } std::tuple<std::string, FlakeRef, flake::EvalCache::Derivation> InstallableFlake::toDerivation() |