From fa161e9a380c530363c3eb72c9917e4db88287e0 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 13 Jul 2020 21:20:52 +0100 Subject: refactor(3p/nix/libexpr): Remove the nix::Symbol default constructor Having a default constructor for this causes a variety of annoying situations across the codebase in which this is initialised to an unexpected value, leading to constant guarding against those conditions. It turns out there's actually no intrinsic reason that this default constructor needs to exist. The biggest one was addressed in CL/1138 and this commit cleans up the remaining bits. Change-Id: I4a847f50bc90e72f028598196592a7d8730a4e01 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1139 Reviewed-by: isomer Tested-by: BuildkiteCI --- third_party/nix/src/libexpr/primops.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/nix/src/libexpr/primops.cc') diff --git a/third_party/nix/src/libexpr/primops.cc b/third_party/nix/src/libexpr/primops.cc index b238da762d..d96af55f5c 100644 --- a/third_party/nix/src/libexpr/primops.cc +++ b/third_party/nix/src/libexpr/primops.cc @@ -234,7 +234,7 @@ void prim_exec(EvalState& state, const Pos& pos, Value** args, Value& v) { auto output = runProgram(program, true, commandArgs); Expr* parsed; try { - parsed = state.parseExprFromString(output, pos.file); + parsed = state.parseExprFromString(output, pos.file.value()); } catch (Error& e) { e.addPrefix(format("While parsing the output from '%1%', at %2%\n") % program % pos); -- cgit 1.4.1