From cda9e01053ec415701c183bffe7f55b4c9ce4968 Mon Sep 17 00:00:00 2001 From: skye Date: Mon, 9 Mar 2026 21:03:11 -0400 Subject: [PATCH] nix-eval-jobs: Remove Value default construction from releaseExprTopLevelValue Change-Id: I7461323771a50729c66d9e3160c4768f6a6a6964 --- subprojects/nix-eval-jobs/src/worker.cc | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/subprojects/nix-eval-jobs/src/worker.cc b/subprojects/nix-eval-jobs/src/worker.cc index b06dac581..6efab21d3 100644 --- a/subprojects/nix-eval-jobs/src/worker.cc +++ b/subprojects/nix-eval-jobs/src/worker.cc @@ -45,17 +45,18 @@ static nix::Value releaseExprTopLevelValue(nix::EvalState &state, nix::Bindings &autoArgs, MyArgs &args) { - nix::Value vTop; - - if (args.fromArgs) { - nix::Expr &e = state.ctx.parseExprFromString(args.releaseExpr, - nix::CanonPath::fromCwd()); - vTop = state.eval(e); - } else { - vTop = state.evalFile( - state.aio.blockOn(nix::lookupFileArg(state.ctx, args.releaseExpr)) - .unwrap()); - } + nix::Value vTop = [&]() { + if (args.fromArgs) { + nix::Expr &e = state.ctx.parseExprFromString( + args.releaseExpr, nix::CanonPath::fromCwd()); + return state.eval(e); + } else { + return state.evalFile( + state.aio + .blockOn(nix::lookupFileArg(state.ctx, args.releaseExpr)) + .unwrap()); + } + }(); return state.autoCallFunction(autoArgs, vTop, {}); }