From e4fb9a38493a041861fe5c75bc8ddd129a2e5262 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Tue, 21 Apr 2020 17:07:07 -0600
Subject: remove 'format' from Error constructor calls

---
 src/libexpr/attr-path.cc              |  16 ++---
 src/libexpr/eval-inline.hh            |   6 +-
 src/libexpr/eval.cc                   |  23 +++----
 src/libexpr/nixexpr.cc                |   2 +-
 src/libexpr/nixexpr.hh                |   4 +-
 src/libexpr/parser.y                  |  32 ++++-----
 src/libexpr/primops.cc                | 124 +++++++++++++++++-----------------
 src/libexpr/primops/fetchGit.cc       |   2 +-
 src/libexpr/primops/fetchMercurial.cc |   2 +-
 src/libexpr/value-to-json.cc          |   4 +-
 10 files changed, 106 insertions(+), 109 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc
index 76d101b98..9a9531a3f 100644
--- a/src/libexpr/attr-path.cc
+++ b/src/libexpr/attr-path.cc
@@ -19,7 +19,7 @@ static Strings parseAttrPath(const string & s)
             ++i;
             while (1) {
                 if (i == s.end())
-                    throw Error(format("missing closing quote in selection path '%1%'") % s);
+                    throw Error("missing closing quote in selection path '%1%'", s);
                 if (*i == '"') break;
                 cur.push_back(*i++);
             }
@@ -60,11 +60,11 @@ std::pair<Value *, Pos> findAlongAttrPath(EvalState & state, const string & attr
 
             if (v->type != tAttrs)
                 throw TypeError(
-                    format("the expression selected by the selection path '%1%' should be a set but is %2%")
-                    % attrPath % showType(*v));
-
+                    "the expression selected by the selection path '%1%' should be a set but is %2%",
+                    attrPath,
+                    showType(*v)); 
             if (attr.empty())
-                throw Error(format("empty attribute name in selection path '%1%'") % attrPath);
+                throw Error("empty attribute name in selection path '%1%'", attrPath);
 
             Bindings::iterator a = v->attrs->find(state.symbols.create(attr));
             if (a == v->attrs->end())
@@ -77,9 +77,9 @@ std::pair<Value *, Pos> findAlongAttrPath(EvalState & state, const string & attr
 
             if (!v->isList())
                 throw TypeError(
-                    format("the expression selected by the selection path '%1%' should be a list but is %2%")
-                    % attrPath % showType(*v));
-
+                    "the expression selected by the selection path '%1%' should be a list but is %2%",
+                    attrPath,
+                    showType(*v)); 
             if (attrIndex >= v->listSize())
                 throw AttrPathNotFound("list index %1% in selection path '%2%' is out of range", attrIndex, attrPath);
 
diff --git a/src/libexpr/eval-inline.hh b/src/libexpr/eval-inline.hh
index c27116e3b..4d82ccf09 100644
--- a/src/libexpr/eval-inline.hh
+++ b/src/libexpr/eval-inline.hh
@@ -9,18 +9,18 @@ namespace nix {
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const Pos & pos))
 {
-    throw EvalError(format(s) % pos);
+    throw EvalError(s, pos);
 }
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v))
 {
-    throw TypeError(format(s) % showType(v));
+    throw TypeError(s, showType(v));
 }
 
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v, const Pos & pos))
 {
-    throw TypeError(format(s) % showType(v) % pos);
+    throw TypeError(s, showType(v), pos);
 }
 
 
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index dac32b6f5..516c25b02 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -493,52 +493,52 @@ Value & EvalState::getBuiltin(const string & name)
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2))
 {
-    throw EvalError(format(s) % s2);
+    throw EvalError(s, s2);
 }
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const Pos & pos))
 {
-    throw EvalError(format(s) % s2 % pos);
+    throw EvalError(s, s2, pos);
 }
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const string & s3))
 {
-    throw EvalError(format(s) % s2 % s3);
+    throw EvalError(s, s2, s3);
 }
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const string & s3, const Pos & pos))
 {
-    throw EvalError(format(s) % s2 % s3 % pos);
+    throw EvalError(s, s2, s3, pos);
 }
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const Symbol & sym, const Pos & p1, const Pos & p2))
 {
-    throw EvalError(format(s) % sym % p1 % p2);
+    throw EvalError(s, sym, p1, p2);
 }
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const Pos & pos))
 {
-    throw TypeError(format(s) % pos);
+    throw TypeError(s, pos);
 }
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1))
 {
-    throw TypeError(format(s) % s1);
+    throw TypeError(s, s1);
 }
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const ExprLambda & fun, const Symbol & s2, const Pos & pos))
 {
-    throw TypeError(format(s) % fun.showNamePos() % s2 % pos);
+    throw TypeError(s, fun.showNamePos(), s2, pos);
 }
 
 LocalNoInlineNoReturn(void throwAssertionError(const char * s, const string & s1, const Pos & pos))
 {
-    throw AssertionError(format(s) % s1 % pos);
+    throw AssertionError(s, s1, pos);
 }
 
 LocalNoInlineNoReturn(void throwUndefinedVarError(const char * s, const string & s1, const Pos & pos))
 {
-    throw UndefinedVarError(format(s) % s1 % pos);
+    throw UndefinedVarError(s, s1, pos);
 }
 
 LocalNoInline(void addErrorPrefix(Error & e, const char * s, const string & s2))
@@ -1883,8 +1883,7 @@ void EvalState::printStats()
 
 string ExternalValueBase::coerceToString(const Pos & pos, PathSet & context, bool copyMore, bool copyToStore) const
 {
-    throw TypeError(format("cannot coerce %1% to a string, at %2%") %
-        showType() % pos);
+    throw TypeError("cannot coerce %1% to a string, at %2%", showType(), pos);
 }
 
 
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index 63cbef1dd..a9955f6df 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -267,7 +267,7 @@ void ExprVar::bindVars(const StaticEnv & env)
     /* Otherwise, the variable must be obtained from the nearest
        enclosing `with'.  If there is no `with', then we can issue an
        "undefined variable" error now. */
-    if (withLevel == -1) throw UndefinedVarError(format("undefined variable '%1%' at %2%") % name % pos);
+    if (withLevel == -1) throw UndefinedVarError("undefined variable '%1%' at %2%", name, pos);
 
     fromWith = true;
     this->level = withLevel;
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index f7e9105a4..79e3f90e5 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -234,9 +234,7 @@ struct ExprLambda : Expr
         : pos(pos), arg(arg), matchAttrs(matchAttrs), formals(formals), body(body)
     {
         if (!arg.empty() && formals && formals->argNames.find(arg) != formals->argNames.end())
-            throw ParseError(format("duplicate formal function argument '%1%' at %2%")
-                % arg % pos);
-    };
+            throw ParseError("duplicate formal function argument '%1%' at %2%", arg, pos); };
     void setName(Symbol & name);
     string showNamePos() const;
     COMMON_METHODS
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 9c769e803..3767532d5 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -64,15 +64,15 @@ namespace nix {
 
 static void dupAttr(const AttrPath & attrPath, const Pos & pos, const Pos & prevPos)
 {
-    throw ParseError(format("attribute '%1%' at %2% already defined at %3%")
-        % showAttrPath(attrPath) % pos % prevPos);
+    throw ParseError("attribute '%1%' at %2% already defined at %3%",
+        showAttrPath(attrPath), pos, prevPos);
 }
 
 
 static void dupAttr(Symbol attr, const Pos & pos, const Pos & prevPos)
 {
-    throw ParseError(format("attribute '%1%' at %2% already defined at %3%")
-        % attr % pos % prevPos);
+    throw ParseError("attribute '%1%' at %2% already defined at %3%",
+        attr, pos, prevPos);
 }
 
 
@@ -140,8 +140,8 @@ static void addAttr(ExprAttrs * attrs, AttrPath & attrPath,
 static void addFormal(const Pos & pos, Formals * formals, const Formal & formal)
 {
     if (!formals->argNames.insert(formal.name).second)
-        throw ParseError(format("duplicate formal function argument '%1%' at %2%")
-            % formal.name % pos);
+        throw ParseError("duplicate formal function argument '%1%' at %2%",
+            formal.name, pos);
     formals->formals.push_front(formal);
 }
 
@@ -327,8 +327,7 @@ expr_function
     { $$ = new ExprWith(CUR_POS, $2, $4); }
   | LET binds IN expr_function
     { if (!$2->dynamicAttrs.empty())
-        throw ParseError(format("dynamic attributes not allowed in let at %1%")
-            % CUR_POS);
+        throw ParseError("dynamic attributes not allowed in let at %1%", CUR_POS);
       $$ = new ExprLet($2, $4);
     }
   | expr_if
@@ -475,8 +474,8 @@ attrs
           $$->push_back(AttrName(str->s));
           delete str;
       } else
-          throw ParseError(format("dynamic attributes not allowed in inherit at %1%")
-              % makeCurPos(@2, data));
+          throw ParseError("dynamic attributes not allowed in inherit at %1%",
+              makeCurPos(@2, data));
     }
   | { $$ = new AttrPath; }
   ;
@@ -670,11 +669,10 @@ Path EvalState::findFile(SearchPath & searchPath, const string & path, const Pos
         Path res = r.second + suffix;
         if (pathExists(res)) return canonPath(res);
     }
-    format f = format(
+    string f = 
         "file '%1%' was not found in the Nix search path (add it using $NIX_PATH or -I)"
-        + string(pos ? ", at %2%" : ""));
-    f.exceptions(boost::io::all_error_bits ^ boost::io::too_many_args_bit);
-    throw ThrownError(f % path % pos);
+        + string(pos ? ", at %2%" : "");
+    throw ThrownError(f, path, pos);
 }
 
 
@@ -691,7 +689,8 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
             request.unpack = true;
             res = { true, getDownloader()->downloadCached(store, request).path };
         } catch (DownloadError & e) {
-            printError(format("warning: Nix search path entry '%1%' cannot be downloaded, ignoring") % elem.second);
+            // TODO: change to warn()?
+            printError("warning: Nix search path entry '%1%' cannot be downloaded, ignoring", elem.second);
             res = { false, "" };
         }
     } else {
@@ -699,7 +698,8 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
         if (pathExists(path))
             res = { true, path };
         else {
-            printError(format("warning: Nix search path entry '%1%' does not exist, ignoring") % elem.second);
+            // TODO: change to warn()?
+            printError("warning: Nix search path entry '%1%' does not exist, ignoring", elem.second);
             res = { false, "" };
         }
     }
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 8de234951..13eb1ba58 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -94,8 +94,8 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError(format("cannot import '%1%', since path '%2%' is not valid, at %3%")
-            % path % e.path % pos);
+        throw EvalError("cannot import '%1%', since path '%2%' is not valid, at %3%",
+                        path, e.path, pos);
     }
 
     Path realPath = state.checkSourcePath(state.toRealPath(path, context));
@@ -171,8 +171,8 @@ void prim_importNative(EvalState & state, const Pos & pos, Value * * args, Value
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError(format("cannot import '%1%', since path '%2%' is not valid, at %3%")
-            % path % e.path % pos);
+        throw EvalError("cannot import '%1%', since path '%2%' is not valid, at %3%"
+           , path, e.path, pos);
     }
 
     path = state.checkSourcePath(path);
@@ -181,17 +181,17 @@ void prim_importNative(EvalState & state, const Pos & pos, Value * * args, Value
 
     void *handle = dlopen(path.c_str(), RTLD_LAZY | RTLD_LOCAL);
     if (!handle)
-        throw EvalError(format("could not open '%1%': %2%") % path % dlerror());
+        throw EvalError("could not open '%1%': %2%", path, dlerror());
 
     dlerror();
     ValueInitializer func = (ValueInitializer) dlsym(handle, sym.c_str());
     if(!func) {
         char *message = dlerror();
         if (message)
-            throw EvalError(format("could not load symbol '%1%' from '%2%': %3%") % sym % path % message);
+            throw EvalError("could not load symbol '%1%' from '%2%': %3%", sym, path, message);
         else
-            throw EvalError(format("symbol '%1%' from '%2%' resolved to NULL when a function pointer was expected")
-                    % sym % path);
+            throw EvalError("symbol '%1%' from '%2%' resolved to NULL when a function pointer was expected"
+                   , sym, path);
     }
 
     (func)(state, v);
@@ -207,7 +207,7 @@ void prim_exec(EvalState & state, const Pos & pos, Value * * args, Value & v)
     auto elems = args[0]->listElems();
     auto count = args[0]->listSize();
     if (count == 0) {
-        throw EvalError(format("at least one argument to 'exec' required, at %1%") % pos);
+        throw EvalError("at least one argument to 'exec' required, at %1%", pos);
     }
     PathSet context;
     auto program = state.coerceToString(pos, *elems[0], context, false, false);
@@ -218,8 +218,8 @@ void prim_exec(EvalState & state, const Pos & pos, Value * * args, Value & v)
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError(format("cannot execute '%1%', since path '%2%' is not valid, at %3%")
-            % program % e.path % pos);
+        throw EvalError("cannot execute '%1%', since path '%2%' is not valid, at %3%"
+           , program, e.path, pos);
     }
 
     auto output = runProgram(program, true, commandArgs);
@@ -227,13 +227,13 @@ void prim_exec(EvalState & state, const Pos & pos, Value * * args, Value & v)
     try {
         parsed = state.parseExprFromString(output, pos.file);
     } catch (Error & e) {
-        e.addPrefix(format("While parsing the output from '%1%', at %2%\n") % program % pos);
+        e.addPrefix(fmt("While parsing the output from '%1%', at %2%\n", program, pos));
         throw;
     }
     try {
         state.eval(parsed, v);
     } catch (Error & e) {
-        e.addPrefix(format("While evaluating the output from '%1%', at %2%\n") % program % pos);
+        e.addPrefix(fmt("While evaluating the output from '%1%', at %2%\n", program, pos));
         throw;
     }
 }
@@ -339,7 +339,7 @@ struct CompareValues
         if (v1->type == tInt && v2->type == tFloat)
             return v1->integer < v2->fpoint;
         if (v1->type != v2->type)
-            throw EvalError(format("cannot compare %1% with %2%") % showType(*v1) % showType(*v2));
+            throw EvalError("cannot compare %1% with %2%", showType(*v1), showType(*v2));
         switch (v1->type) {
             case tInt:
                 return v1->integer < v2->integer;
@@ -350,7 +350,7 @@ struct CompareValues
             case tPath:
                 return strcmp(v1->path, v2->path) < 0;
             default:
-                throw EvalError(format("cannot compare %1% with %2%") % showType(*v1) % showType(*v2));
+                throw EvalError("cannot compare %1% with %2%", showType(*v1), showType(*v2));
         }
     }
 };
@@ -371,7 +371,7 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
     Bindings::iterator startSet =
         args[0]->attrs->find(state.symbols.create("startSet"));
     if (startSet == args[0]->attrs->end())
-        throw EvalError(format("attribute 'startSet' required, at %1%") % pos);
+        throw EvalError("attribute 'startSet' required, at %1%", pos);
     state.forceList(*startSet->value, pos);
 
     ValueList workSet;
@@ -382,7 +382,7 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
     Bindings::iterator op =
         args[0]->attrs->find(state.symbols.create("operator"));
     if (op == args[0]->attrs->end())
-        throw EvalError(format("attribute 'operator' required, at %1%") % pos);
+        throw EvalError("attribute 'operator' required, at %1%", pos);
     state.forceValue(*op->value);
 
     /* Construct the closure by applying the operator to element of
@@ -401,7 +401,7 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
         Bindings::iterator key =
             e->attrs->find(state.symbols.create("key"));
         if (key == e->attrs->end())
-            throw EvalError(format("attribute 'key' required, at %1%") % pos);
+            throw EvalError("attribute 'key' required, at %1%", pos);
         state.forceValue(*key->value);
 
         if (!doneKeys.insert(key->value).second) continue;
@@ -431,7 +431,7 @@ static void prim_abort(EvalState & state, const Pos & pos, Value * * args, Value
 {
     PathSet context;
     string s = state.coerceToString(pos, *args[0], context);
-    throw Abort(format("evaluation aborted with the following error message: '%1%'") % s);
+    throw Abort("evaluation aborted with the following error message: '%1%'", s);
 }
 
 
@@ -506,9 +506,9 @@ static void prim_trace(EvalState & state, const Pos & pos, Value * * args, Value
 {
     state.forceValue(*args[0]);
     if (args[0]->type == tString)
-        printError(format("trace: %1%") % args[0]->string.s);
+        printError("trace: %1%", args[0]->string.s);
     else
-        printError(format("trace: %1%") % *args[0]);
+        printError("trace: %1%", *args[0]);
     state.forceValue(*args[1]);
     v = *args[1];
 }
@@ -533,13 +533,13 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
     /* Figure out the name first (for stack backtraces). */
     Bindings::iterator attr = args[0]->attrs->find(state.sName);
     if (attr == args[0]->attrs->end())
-        throw EvalError(format("required attribute 'name' missing, at %1%") % pos);
+        throw EvalError("required attribute 'name' missing, at %1%", pos);
     string drvName;
     Pos & posDrvName(*attr->pos);
     try {
         drvName = state.forceStringNoCtx(*attr->value, pos);
     } catch (Error & e) {
-        e.addPrefix(format("while evaluating the derivation attribute 'name' at %1%:\n") % posDrvName);
+        e.addPrefix(fmt("while evaluating the derivation attribute 'name' at %1%:\n", posDrvName));
         throw;
     }
 
@@ -583,18 +583,18 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
             outputs.clear();
             for (auto & j : ss) {
                 if (outputs.find(j) != outputs.end())
-                    throw EvalError(format("duplicate derivation output '%1%', at %2%") % j % posDrvName);
+                    throw EvalError("duplicate derivation output '%1%', at %2%", j, posDrvName);
                 /* !!! Check whether j is a valid attribute
                    name. */
                 /* Derivations cannot be named ‘drv’, because
                    then we'd have an attribute ‘drvPath’ in
                    the resulting set. */
                 if (j == "drv")
-                    throw EvalError(format("invalid derivation output name 'drv', at %1%") % posDrvName);
+                    throw EvalError("invalid derivation output name 'drv', at %1%", posDrvName);
                 outputs.insert(j);
             }
             if (outputs.empty())
-                throw EvalError(format("derivation cannot have an empty set of outputs, at %1%") % posDrvName);
+                throw EvalError("derivation cannot have an empty set of outputs, at %1%", posDrvName);
         };
 
         try {
@@ -706,9 +706,9 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
 
     /* Do we have all required attributes? */
     if (drv.builder == "")
-        throw EvalError(format("required attribute 'builder' missing, at %1%") % posDrvName);
+        throw EvalError("required attribute 'builder' missing, at %1%", posDrvName);
     if (drv.platform == "")
-        throw EvalError(format("required attribute 'system' missing, at %1%") % posDrvName);
+        throw EvalError("required attribute 'system' missing, at %1%", posDrvName);
 
     /* Check whether the derivation name is valid. */
     if (isDerivation(drvName))
@@ -717,7 +717,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
     if (outputHash) {
         /* Handle fixed-output derivations. */
         if (outputs.size() != 1 || *(outputs.begin()) != "out")
-            throw Error(format("multiple outputs are not supported in fixed-output derivations, at %1%") % posDrvName);
+            throw Error("multiple outputs are not supported in fixed-output derivations, at %1%", posDrvName);
 
         HashType ht = outputHashAlgo.empty() ? htUnknown : parseHashType(outputHashAlgo);
         Hash h(*outputHash, ht);
@@ -818,7 +818,7 @@ static void prim_storePath(EvalState & state, const Pos & pos, Value * * args, V
        e.g. nix-push does the right thing. */
     if (!state.store->isStorePath(path)) path = canonPath(path, true);
     if (!state.store->isInStore(path))
-        throw EvalError(format("path '%1%' is not in the Nix store, at %2%") % path % pos);
+        throw EvalError("path '%1%' is not in the Nix store, at %2%", path, pos);
     Path path2 = state.store->toStorePath(path);
     if (!settings.readOnlyMode)
         state.store->ensurePath(state.store->parseStorePath(path2));
@@ -834,9 +834,9 @@ static void prim_pathExists(EvalState & state, const Pos & pos, Value * * args,
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError(format(
-                "cannot check the existence of '%1%', since path '%2%' is not valid, at %3%")
-            % path % e.path % pos);
+        throw EvalError(
+                "cannot check the existence of '%1%', since path '%2%' is not valid, at %3%", 
+                path, e.path, pos);
     }
 
     try {
@@ -879,12 +879,12 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError(format("cannot read '%1%', since path '%2%' is not valid, at %3%")
-            % path % e.path % pos);
+        throw EvalError("cannot read '%1%', since path '%2%' is not valid, at %3%"
+           , path, e.path, pos);
     }
     string s = readFile(state.checkSourcePath(state.toRealPath(path, context)));
     if (s.find((char) 0) != string::npos)
-        throw Error(format("the contents of the file '%1%' cannot be represented as a Nix string") % path);
+        throw Error("the contents of the file '%1%' cannot be represented as a Nix string", path);
     mkString(v, s.c_str());
 }
 
@@ -908,7 +908,7 @@ static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Va
 
         i = v2.attrs->find(state.symbols.create("path"));
         if (i == v2.attrs->end())
-            throw EvalError(format("attribute 'path' missing, at %1%") % pos);
+            throw EvalError("attribute 'path' missing, at %1%", pos);
 
         PathSet context;
         string path = state.coerceToString(pos, *i->value, context, false, false);
@@ -916,8 +916,8 @@ static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Va
         try {
             state.realiseContext(context);
         } catch (InvalidPathError & e) {
-            throw EvalError(format("cannot find '%1%', since path '%2%' is not valid, at %3%")
-                % path % e.path % pos);
+            throw EvalError("cannot find '%1%', since path '%2%' is not valid, at %3%",
+                        path, e.path, pos);
         }
 
         searchPath.emplace_back(prefix, path);
@@ -934,7 +934,7 @@ static void prim_hashFile(EvalState & state, const Pos & pos, Value * * args, Va
     string type = state.forceStringNoCtx(*args[0], pos);
     HashType ht = parseHashType(type);
     if (ht == htUnknown)
-      throw Error(format("unknown hash type '%1%', at %2%") % type % pos);
+      throw Error("unknown hash type '%1%', at %2%", type, pos);
 
     PathSet context; // discarded
     Path p = state.coerceToPath(pos, *args[1], context);
@@ -950,8 +950,8 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val
     try {
         state.realiseContext(ctx);
     } catch (InvalidPathError & e) {
-        throw EvalError(format("cannot read '%1%', since path '%2%' is not valid, at %3%")
-            % path % e.path % pos);
+        throw EvalError("cannot read '%1%', since path '%2%' is not valid, at %3%",
+                        path, e.path, pos);
     }
 
     DirEntries entries = readDirectory(state.checkSourcePath(path));
@@ -1021,7 +1021,7 @@ static void prim_toFile(EvalState & state, const Pos & pos, Value * * args, Valu
 
     for (auto path : context) {
         if (path.at(0) != '/')
-            throw EvalError(format("in 'toFile': the file '%1%' cannot refer to derivation outputs, at %2%") % name % pos);
+            throw EvalError("in 'toFile': the file '%1%' cannot refer to derivation outputs, at %2%", name, pos);
         refs.insert(state.store->parseStorePath(path));
     }
 
@@ -1089,11 +1089,11 @@ static void prim_filterSource(EvalState & state, const Pos & pos, Value * * args
     PathSet context;
     Path path = state.coerceToPath(pos, *args[1], context);
     if (!context.empty())
-        throw EvalError(format("string '%1%' cannot refer to other paths, at %2%") % path % pos);
+        throw EvalError("string '%1%' cannot refer to other paths, at %2%", path, pos);
 
     state.forceValue(*args[0]);
     if (args[0]->type != tLambda)
-        throw TypeError(format("first argument in call to 'filterSource' is not a function but %1%, at %2%") % showType(*args[0]) % pos);
+        throw TypeError("first argument in call to 'filterSource' is not a function but %1%, at %2%", showType(*args[0]), pos);
 
     addPath(state, pos, std::string(baseNameOf(path)), path, args[0], true, Hash(), v);
 }
@@ -1113,7 +1113,7 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
             PathSet context;
             path = state.coerceToPath(*attr.pos, *attr.value, context);
             if (!context.empty())
-                throw EvalError(format("string '%1%' cannot refer to other paths, at %2%") % path % *attr.pos);
+                throw EvalError("string '%1%' cannot refer to other paths, at %2%", path, *attr.pos);
         } else if (attr.name == state.sName)
             name = state.forceStringNoCtx(*attr.value, *attr.pos);
         else if (n == "filter") {
@@ -1124,10 +1124,10 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
         else if (n == "sha256")
             expectedHash = Hash(state.forceStringNoCtx(*attr.value, *attr.pos), htSHA256);
         else
-            throw EvalError(format("unsupported argument '%1%' to 'addPath', at %2%") % attr.name % *attr.pos);
+            throw EvalError("unsupported argument '%1%' to 'addPath', at %2%", attr.name, *attr.pos);
     }
     if (path.empty())
-        throw EvalError(format("'path' required, at %1%") % pos);
+        throw EvalError("'path' required, at %1%", pos);
     if (name.empty())
         name = baseNameOf(path);
 
@@ -1185,7 +1185,7 @@ void prim_getAttr(EvalState & state, const Pos & pos, Value * * args, Value & v)
     // !!! Should we create a symbol here or just do a lookup?
     Bindings::iterator i = args[1]->attrs->find(state.symbols.create(attr));
     if (i == args[1]->attrs->end())
-        throw EvalError(format("attribute '%1%' missing, at %2%") % attr % pos);
+        throw EvalError("attribute '%1%' missing, at %2%", attr, pos);
     // !!! add to stack trace?
     if (state.countCalls && i->pos) state.attrSelects[*i->pos]++;
     state.forceValue(*i->value);
@@ -1265,14 +1265,14 @@ static void prim_listToAttrs(EvalState & state, const Pos & pos, Value * * args,
 
         Bindings::iterator j = v2.attrs->find(state.sName);
         if (j == v2.attrs->end())
-            throw TypeError(format("'name' attribute missing in a call to 'listToAttrs', at %1%") % pos);
+            throw TypeError("'name' attribute missing in a call to 'listToAttrs', at %1%", pos);
         string name = state.forceStringNoCtx(*j->value, pos);
 
         Symbol sym = state.symbols.create(name);
         if (seen.insert(sym).second) {
             Bindings::iterator j2 = v2.attrs->find(state.symbols.create(state.sValue));
             if (j2 == v2.attrs->end())
-                throw TypeError(format("'value' attribute missing in a call to 'listToAttrs', at %1%") % pos);
+                throw TypeError("'value' attribute missing in a call to 'listToAttrs', at %1%", pos);
 
             v.attrs->push_back(Attr(sym, j2->value, j2->pos));
         }
@@ -1346,7 +1346,7 @@ static void prim_functionArgs(EvalState & state, const Pos & pos, Value * * args
 {
     state.forceValue(*args[0]);
     if (args[0]->type != tLambda)
-        throw TypeError(format("'functionArgs' requires a function, at %1%") % pos);
+        throw TypeError("'functionArgs' requires a function, at %1%", pos);
 
     if (!args[0]->lambda.fun->matchAttrs) {
         state.mkAttrs(v, 0);
@@ -1396,7 +1396,7 @@ static void elemAt(EvalState & state, const Pos & pos, Value & list, int n, Valu
 {
     state.forceList(list, pos);
     if (n < 0 || (unsigned int) n >= list.listSize())
-        throw Error(format("list index %1% is out of bounds, at %2%") % n % pos);
+        throw Error("list index %1% is out of bounds, at %2%", n, pos);
     state.forceValue(*list.listElems()[n]);
     v = *list.listElems()[n];
 }
@@ -1423,7 +1423,7 @@ static void prim_tail(EvalState & state, const Pos & pos, Value * * args, Value
 {
     state.forceList(*args[0], pos);
     if (args[0]->listSize() == 0)
-        throw Error(format("'tail' called on an empty list, at %1%") % pos);
+        throw Error("'tail' called on an empty list, at %1%", pos);
     state.mkList(v, args[0]->listSize() - 1);
     for (unsigned int n = 0; n < v.listSize(); ++n)
         v.listElems()[n] = args[0]->listElems()[n + 1];
@@ -1564,7 +1564,7 @@ static void prim_genList(EvalState & state, const Pos & pos, Value * * args, Val
     auto len = state.forceInt(*args[1], pos);
 
     if (len < 0)
-        throw EvalError(format("cannot create list of size %1%, at %2%") % len % pos);
+        throw EvalError("cannot create list of size %1%, at %2%", len, pos);
 
     state.mkList(v, len);
 
@@ -1722,7 +1722,7 @@ static void prim_div(EvalState & state, const Pos & pos, Value * * args, Value &
     state.forceValue(*args[1], pos);
 
     NixFloat f2 = state.forceFloat(*args[1], pos);
-    if (f2 == 0) throw EvalError(format("division by zero, at %1%") % pos);
+    if (f2 == 0) throw EvalError("division by zero, at %1%", pos);
 
     if (args[0]->type == tFloat || args[1]->type == tFloat) {
         mkFloat(v, state.forceFloat(*args[0], pos) / state.forceFloat(*args[1], pos));
@@ -1731,7 +1731,7 @@ static void prim_div(EvalState & state, const Pos & pos, Value * * args, Value &
         NixInt i2 = state.forceInt(*args[1], pos);
         /* Avoid division overflow as it might raise SIGFPE. */
         if (i1 == std::numeric_limits<NixInt>::min() && i2 == -1)
-            throw EvalError(format("overflow in integer division, at %1%") % pos);
+            throw EvalError("overflow in integer division, at %1%", pos);
         mkInt(v, i1 / i2);
     }
 }
@@ -1787,7 +1787,7 @@ static void prim_substring(EvalState & state, const Pos & pos, Value * * args, V
     PathSet context;
     string s = state.coerceToString(pos, *args[2], context);
 
-    if (start < 0) throw EvalError(format("negative start position in 'substring', at %1%") % pos);
+    if (start < 0) throw EvalError("negative start position in 'substring', at %1%", pos);
 
     mkString(v, (unsigned int) start >= s.size() ? "" : string(s, start, len), context);
 }
@@ -1807,7 +1807,7 @@ static void prim_hashString(EvalState & state, const Pos & pos, Value * * args,
     string type = state.forceStringNoCtx(*args[0], pos);
     HashType ht = parseHashType(type);
     if (ht == htUnknown)
-      throw Error(format("unknown hash type '%1%', at %2%") % type % pos);
+      throw Error("unknown hash type '%1%', at %2%", type, pos);
 
     PathSet context; // discarded
     string s = state.forceString(*args[1], context, pos);
@@ -1950,7 +1950,7 @@ static void prim_replaceStrings(EvalState & state, const Pos & pos, Value * * ar
     state.forceList(*args[0], pos);
     state.forceList(*args[1], pos);
     if (args[0]->listSize() != args[1]->listSize())
-        throw EvalError(format("'from' and 'to' arguments to 'replaceStrings' have different lengths, at %1%") % pos);
+        throw EvalError("'from' and 'to' arguments to 'replaceStrings' have different lengths, at %1%", pos);
 
     vector<string> from;
     from.reserve(args[0]->listSize());
@@ -2072,11 +2072,11 @@ void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
             else if (n == "name")
                 request.name = state.forceStringNoCtx(*attr.value, *attr.pos);
             else
-                throw EvalError(format("unsupported argument '%1%' to '%2%', at %3%") % attr.name % who % attr.pos);
+                throw EvalError("unsupported argument '%1%' to '%2%', at %3%", attr.name, who, attr.pos);
         }
 
         if (request.uri.empty())
-            throw EvalError(format("'url' argument required, at %1%") % pos);
+            throw EvalError("'url' argument required, at %1%", pos);
 
     } else
         request.uri = state.forceStringNoCtx(*args[0], pos);
diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc
index 4aee1073e..480cc1adc 100644
--- a/src/libexpr/primops/fetchGit.cc
+++ b/src/libexpr/primops/fetchGit.cc
@@ -221,7 +221,7 @@ static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Va
         }
 
         if (url.empty())
-            throw EvalError(format("'url' argument required, at %1%") % pos);
+            throw EvalError("'url' argument required, at %1%", pos);
 
     } else
         url = state.coerceToString(pos, *args[0], context, false, false);
diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc
index db274fa4f..76029f548 100644
--- a/src/libexpr/primops/fetchMercurial.cc
+++ b/src/libexpr/primops/fetchMercurial.cc
@@ -191,7 +191,7 @@ static void prim_fetchMercurial(EvalState & state, const Pos & pos, Value * * ar
         }
 
         if (url.empty())
-            throw EvalError(format("'url' argument required, at %1%") % pos);
+            throw EvalError("'url' argument required, at %1%", pos);
 
     } else
         url = state.coerceToString(pos, *args[0], context, false, false);
diff --git a/src/libexpr/value-to-json.cc b/src/libexpr/value-to-json.cc
index 5fe8570ad..6ec8315ba 100644
--- a/src/libexpr/value-to-json.cc
+++ b/src/libexpr/value-to-json.cc
@@ -79,7 +79,7 @@ void printValueAsJSON(EvalState & state, bool strict,
             break;
 
         default:
-            throw TypeError(format("cannot convert %1% to JSON") % showType(v));
+            throw TypeError("cannot convert %1% to JSON", showType(v));
     }
 }
 
@@ -93,7 +93,7 @@ void printValueAsJSON(EvalState & state, bool strict,
 void ExternalValueBase::printValueAsJSON(EvalState & state, bool strict,
     JSONPlaceholder & out, PathSet & context) const
 {
-    throw TypeError(format("cannot convert %1% to JSON") % showType());
+    throw TypeError("cannot convert %1% to JSON", showType());
 }
 
 
-- 
cgit v1.2.3


From 3bc9155dfc14434f5e9566fd15c79141899f6d07 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Wed, 22 Apr 2020 15:00:11 -0600
Subject: a few more 'format's rremoved

---
 src/libexpr/lexer.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l
index c34e5c383..85376a08f 100644
--- a/src/libexpr/lexer.l
+++ b/src/libexpr/lexer.l
@@ -127,14 +127,14 @@ or          { return OR_KW; }
               try {
                   yylval->n = boost::lexical_cast<int64_t>(yytext);
               } catch (const boost::bad_lexical_cast &) {
-                  throw ParseError(format("invalid integer '%1%'") % yytext);
+                  throw ParseError("invalid integer '%1%'", yytext);
               }
               return INT;
             }
 {FLOAT}     { errno = 0;
               yylval->nf = strtod(yytext, 0);
               if (errno != 0)
-                  throw ParseError(format("invalid float '%1%'") % yytext);
+                  throw ParseError("invalid float '%1%'", yytext);
               return FLOAT;
             }
 
-- 
cgit v1.2.3


From e2f61263ebf41958f4f3d6f6135377024e33457c Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Wed, 29 Apr 2020 10:14:32 -0600
Subject: uncrustify formatting

---
 src/libexpr/nixexpr.hh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index 79e3f90e5..a8bae0a61 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -234,7 +234,8 @@ struct ExprLambda : Expr
         : pos(pos), arg(arg), matchAttrs(matchAttrs), formals(formals), body(body)
     {
         if (!arg.empty() && formals && formals->argNames.find(arg) != formals->argNames.end())
-            throw ParseError("duplicate formal function argument '%1%' at %2%", arg, pos); };
+            throw ParseError("duplicate formal function argument '%1%' at %2%", arg, pos);
+    };
     void setName(Symbol & name);
     string showNamePos() const;
     COMMON_METHODS
-- 
cgit v1.2.3


From ab6f0b9641ad6e9cef72f73d23e31138a97a225b Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Sun, 3 May 2020 08:01:25 -0600
Subject: convert some printError calls to logError

---
 src/libexpr/parser.y | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 3767532d5..3ed9a7a4f 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -689,8 +689,12 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
             request.unpack = true;
             res = { true, getDownloader()->downloadCached(store, request).path };
         } catch (DownloadError & e) {
-            // TODO: change to warn()?
-            printError("warning: Nix search path entry '%1%' cannot be downloaded, ignoring", elem.second);
+            logWarning(
+                ErrorInfo { 
+                    .name = "Download Error",
+                    .hint = hintfmt("warning: Nix search path entry '%1%' cannot be downloaded, ignoring", elem.second)
+            });
+
             res = { false, "" };
         }
     } else {
@@ -698,8 +702,11 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
         if (pathExists(path))
             res = { true, path };
         else {
-            // TODO: change to warn()?
-            printError("warning: Nix search path entry '%1%' does not exist, ignoring", elem.second);
+            logWarning(
+                ErrorInfo { 
+                    .name = "Search path not found",
+                    .hint = hintfmt("warning: Nix search path entry '%1%' does not exist, ignoring", elem.second)
+            });
             res = { false, "" };
         }
     }
-- 
cgit v1.2.3


From 55eb71714854b262b5e1079ff250a13cc0bbf644 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Fri, 8 May 2020 18:18:28 -0600
Subject: add pos to errorinfo, remove from hints

---
 src/libexpr/attr-set.hh               |   7 +-
 src/libexpr/eval-inline.hh            |  18 +-
 src/libexpr/eval.cc                   |  76 +++++---
 src/libexpr/parser.y                  |  17 +-
 src/libexpr/primops.cc                | 331 ++++++++++++++++++++++++++++------
 src/libexpr/primops/context.cc        |  20 +-
 src/libexpr/primops/fetchGit.cc       |  12 +-
 src/libexpr/primops/fetchMercurial.cc |  13 +-
 8 files changed, 393 insertions(+), 101 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/attr-set.hh b/src/libexpr/attr-set.hh
index 118c7bd5d..f5651891f 100644
--- a/src/libexpr/attr-set.hh
+++ b/src/libexpr/attr-set.hh
@@ -76,7 +76,12 @@ public:
     {
         auto a = get(name);
         if (!a)
-            throw Error("attribute '%s' missing, at %s", name, pos);
+            throw Error(
+                ErrorInfo { 
+                    .hint = hintfmt("attribute '%s' missing", name),
+                    .nixCode = NixCode { .errPos = pos }
+                });
+
         return *a;
     }
 
diff --git a/src/libexpr/eval-inline.hh b/src/libexpr/eval-inline.hh
index 4d82ccf09..d03633cc7 100644
--- a/src/libexpr/eval-inline.hh
+++ b/src/libexpr/eval-inline.hh
@@ -9,7 +9,11 @@ namespace nix {
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const Pos & pos))
 {
-    throw EvalError(s, pos);
+    throw EvalError(
+        ErrorInfo { 
+            .hint = hintfmt(s),
+            .nixCode = NixCode { .errPos = pos }
+        });
 }
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v))
@@ -20,7 +24,11 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v))
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v, const Pos & pos))
 {
-    throw TypeError(s, showType(v), pos);
+    throw TypeError(
+        ErrorInfo { 
+            .hint = hintfmt(s, showType(v)),
+            .nixCode = NixCode { .errPos = pos }
+        });
 }
 
 
@@ -43,7 +51,7 @@ void EvalState::forceValue(Value & v, const Pos & pos)
     else if (v.type == tApp)
         callFunction(*v.app.left, *v.app.right, v, noPos);
     else if (v.type == tBlackhole)
-        throwEvalError("infinite recursion encountered, at %1%", pos);
+        throwEvalError("infinite recursion encountered", pos);
 }
 
 
@@ -59,7 +67,7 @@ inline void EvalState::forceAttrs(Value & v, const Pos & pos)
 {
     forceValue(v);
     if (v.type != tAttrs)
-        throwTypeError("value is %1% while a set was expected, at %2%", v, pos);
+        throwTypeError("value is %1% while a set was expected", v, pos);
 }
 
 
@@ -75,7 +83,7 @@ inline void EvalState::forceList(Value & v, const Pos & pos)
 {
     forceValue(v);
     if (!v.isList())
-        throwTypeError("value is %1% while a list was expected, at %2%", v, pos);
+        throwTypeError("value is %1% while a list was expected", v, pos);
 }
 
 /* Note: Various places expect the allocated memory to be zeroed. */
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 516c25b02..a19b85be4 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -498,7 +498,11 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2))
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const Pos & pos))
 {
-    throw EvalError(s, s2, pos);
+    throw EvalError(
+        ErrorInfo { 
+            .hint = hintfmt(s, s2),
+            .nixCode = NixCode { .errPos = pos }
+        });
 }
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const string & s3))
@@ -508,7 +512,11 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, con
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const string & s3, const Pos & pos))
 {
-    throw EvalError(s, s2, s3, pos);
+    throw EvalError(
+        ErrorInfo { 
+            .hint = hintfmt(s, s2, s3),
+            .nixCode = NixCode { .errPos = pos }
+        });
 }
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const Symbol & sym, const Pos & p1, const Pos & p2))
@@ -518,7 +526,11 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const Symbol & sym, co
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const Pos & pos))
 {
-    throw TypeError(s, pos);
+    throw TypeError(
+        ErrorInfo { 
+            .hint = hintfmt(s),
+            .nixCode = NixCode { .errPos = pos }
+        });
 }
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1))
@@ -528,17 +540,29 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1))
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const ExprLambda & fun, const Symbol & s2, const Pos & pos))
 {
-    throw TypeError(s, fun.showNamePos(), s2, pos);
+    throw TypeError(
+        ErrorInfo { 
+            .hint = hintfmt(s, fun.showNamePos(), s2),
+            .nixCode = NixCode { .errPos = pos }
+        });
 }
 
 LocalNoInlineNoReturn(void throwAssertionError(const char * s, const string & s1, const Pos & pos))
 {
-    throw AssertionError(s, s1, pos);
+    throw AssertionError(
+        ErrorInfo { 
+            .hint = hintfmt(s, s1),
+            .nixCode = NixCode { .errPos = pos }
+        });
 }
 
 LocalNoInlineNoReturn(void throwUndefinedVarError(const char * s, const string & s1, const Pos & pos))
 {
-    throw UndefinedVarError(s, s1, pos);
+    throw UndefinedVarError(
+        ErrorInfo { 
+            .hint = hintfmt(s, s1),
+            .nixCode = NixCode { .errPos = pos }
+        });
 }
 
 LocalNoInline(void addErrorPrefix(Error & e, const char * s, const string & s2))
@@ -804,7 +828,7 @@ inline bool EvalState::evalBool(Env & env, Expr * e, const Pos & pos)
     Value v;
     e->eval(*this, env, v);
     if (v.type != tBool)
-        throwTypeError("value is %1% while a Boolean was expected, at %2%", v, pos);
+        throwTypeError("value is %1% while a Boolean was expected", v, pos);
     return v.boolean;
 }
 
@@ -1006,7 +1030,7 @@ void ExprSelect::eval(EvalState & state, Env & env, Value & v)
             } else {
                 state.forceAttrs(*vAttrs, pos);
                 if ((j = vAttrs->attrs->find(name)) == vAttrs->attrs->end())
-                    throwEvalError("attribute '%1%' missing, at %2%", name, pos);
+                    throwEvalError("attribute '%1%' missing", name, pos);
             }
             vAttrs = j->value;
             pos2 = j->pos;
@@ -1132,7 +1156,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
     }
 
     if (fun.type != tLambda)
-        throwTypeError("attempt to call something which is not a function but %1%, at %2%", fun, pos);
+        throwTypeError("attempt to call something which is not a function but %1%", fun, pos);
 
     ExprLambda & lambda(*fun.lambda.fun);
 
@@ -1160,7 +1184,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
         for (auto & i : lambda.formals->formals) {
             Bindings::iterator j = arg.attrs->find(i.name);
             if (j == arg.attrs->end()) {
-                if (!i.def) throwTypeError("%1% called without required argument '%2%', at %3%",
+                if (!i.def) throwTypeError("%1% called without required argument '%2%'",
                     lambda, i.name, pos);
                 env2.values[displ++] = i.def->maybeThunk(*this, env2);
             } else {
@@ -1176,7 +1200,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
                user. */
             for (auto & i : *arg.attrs)
                 if (lambda.formals->argNames.find(i.name) == lambda.formals->argNames.end())
-                    throwTypeError("%1% called with unexpected argument '%2%', at %3%", lambda, i.name, pos);
+                    throwTypeError("%1% called with unexpected argument '%2%'", lambda, i.name, pos);
             abort(); // can't happen
         }
     }
@@ -1417,14 +1441,14 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
                 nf = n;
                 nf += vTmp.fpoint;
             } else
-                throwEvalError("cannot add %1% to an integer, at %2%", showType(vTmp), pos);
+                throwEvalError("cannot add %1% to an integer", showType(vTmp), pos);
         } else if (firstType == tFloat) {
             if (vTmp.type == tInt) {
                 nf += vTmp.integer;
             } else if (vTmp.type == tFloat) {
                 nf += vTmp.fpoint;
             } else
-                throwEvalError("cannot add %1% to a float, at %2%", showType(vTmp), pos);
+                throwEvalError("cannot add %1% to a float", showType(vTmp), pos);
         } else
             s << state.coerceToString(pos, vTmp, context, false, firstType == tString);
     }
@@ -1435,7 +1459,7 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
         mkFloat(v, nf);
     else if (firstType == tPath) {
         if (!context.empty())
-            throwEvalError("a string that refers to a store path cannot be appended to a path, at %1%", pos);
+            throwEvalError("a string that refers to a store path cannot be appended to a path", pos);
         auto path = canonPath(s.str());
         mkPath(v, path.c_str());
     } else
@@ -1484,7 +1508,7 @@ NixInt EvalState::forceInt(Value & v, const Pos & pos)
 {
     forceValue(v, pos);
     if (v.type != tInt)
-        throwTypeError("value is %1% while an integer was expected, at %2%", v, pos);
+        throwTypeError("value is %1% while an integer was expected", v, pos);
     return v.integer;
 }
 
@@ -1495,7 +1519,7 @@ NixFloat EvalState::forceFloat(Value & v, const Pos & pos)
     if (v.type == tInt)
         return v.integer;
     else if (v.type != tFloat)
-        throwTypeError("value is %1% while a float was expected, at %2%", v, pos);
+        throwTypeError("value is %1% while a float was expected", v, pos);
     return v.fpoint;
 }
 
@@ -1504,7 +1528,7 @@ bool EvalState::forceBool(Value & v, const Pos & pos)
 {
     forceValue(v);
     if (v.type != tBool)
-        throwTypeError("value is %1% while a Boolean was expected, at %2%", v, pos);
+        throwTypeError("value is %1% while a Boolean was expected", v, pos);
     return v.boolean;
 }
 
@@ -1519,7 +1543,7 @@ void EvalState::forceFunction(Value & v, const Pos & pos)
 {
     forceValue(v);
     if (v.type != tLambda && v.type != tPrimOp && v.type != tPrimOpApp && !isFunctor(v))
-        throwTypeError("value is %1% while a function was expected, at %2%", v, pos);
+        throwTypeError("value is %1% while a function was expected", v, pos);
 }
 
 
@@ -1528,7 +1552,7 @@ string EvalState::forceString(Value & v, const Pos & pos)
     forceValue(v, pos);
     if (v.type != tString) {
         if (pos)
-            throwTypeError("value is %1% while a string was expected, at %2%", v, pos);
+            throwTypeError("value is %1% while a string was expected", v, pos);
         else
             throwTypeError("value is %1% while a string was expected", v);
     }
@@ -1557,7 +1581,7 @@ string EvalState::forceStringNoCtx(Value & v, const Pos & pos)
     string s = forceString(v, pos);
     if (v.string.context) {
         if (pos)
-            throwEvalError("the string '%1%' is not allowed to refer to a store path (such as '%2%'), at %3%",
+            throwEvalError("the string '%1%' is not allowed to refer to a store path (such as '%2%')",
                 v.string.s, v.string.context[0], pos);
         else
             throwEvalError("the string '%1%' is not allowed to refer to a store path (such as '%2%')",
@@ -1614,7 +1638,7 @@ string EvalState::coerceToString(const Pos & pos, Value & v, PathSet & context,
             return *maybeString;
         }
         auto i = v.attrs->find(sOutPath);
-        if (i == v.attrs->end()) throwTypeError("cannot coerce a set to a string, at %1%", pos);
+        if (i == v.attrs->end()) throwTypeError("cannot coerce a set to a string", pos);
         return coerceToString(pos, *i->value, context, coerceMore, copyToStore);
     }
 
@@ -1645,7 +1669,7 @@ string EvalState::coerceToString(const Pos & pos, Value & v, PathSet & context,
         }
     }
 
-    throwTypeError("cannot coerce %1% to a string, at %2%", v, pos);
+    throwTypeError("cannot coerce %1% to a string", v, pos);
 }
 
 
@@ -1676,7 +1700,7 @@ Path EvalState::coerceToPath(const Pos & pos, Value & v, PathSet & context)
 {
     string path = coerceToString(pos, v, context, false, false);
     if (path == "" || path[0] != '/')
-        throwEvalError("string '%1%' doesn't represent an absolute path, at %2%", path, pos);
+        throwEvalError("string '%1%' doesn't represent an absolute path", path, pos);
     return path;
 }
 
@@ -1883,7 +1907,11 @@ void EvalState::printStats()
 
 string ExternalValueBase::coerceToString(const Pos & pos, PathSet & context, bool copyMore, bool copyToStore) const
 {
-    throw TypeError("cannot coerce %1% to a string, at %2%", showType(), pos);
+    throw TypeError(
+        ErrorInfo { 
+            .hint = hintfmt("cannot coerce %1% to a string", showType()),
+            .nixCode = NixCode { .errPos = pos }
+        });
 }
 
 
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 3ed9a7a4f..a3ad54a3d 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -404,7 +404,12 @@ expr_simple
   | URI {
       static bool noURLLiterals = settings.isExperimentalFeatureEnabled("no-url-literals");
       if (noURLLiterals)
-          throw ParseError("URL literals are disabled, at %s", CUR_POS);
+          throw ParseError(
+              ErrorInfo { 
+                  .hint = hintfmt("URL literals are disabled"),
+                  .nixCode = NixCode { .errPos = CUR_POS }
+              });
+
       $$ = new ExprString(data->symbols.create($1));
   }
   | '(' expr ')' { $$ = $2; }
@@ -669,10 +674,12 @@ Path EvalState::findFile(SearchPath & searchPath, const string & path, const Pos
         Path res = r.second + suffix;
         if (pathExists(res)) return canonPath(res);
     }
-    string f = 
-        "file '%1%' was not found in the Nix search path (add it using $NIX_PATH or -I)"
-        + string(pos ? ", at %2%" : "");
-    throw ThrownError(f, path, pos);
+
+    throw ThrownError(
+        ErrorInfo { 
+            .hint = hintfmt("file '%1%' was not found in the Nix search path (add it using $NIX_PATH or -I)", path),
+            .nixCode = NixCode { .errPos = pos }
+        });
 }
 
 
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 13eb1ba58..771136af9 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -94,8 +94,13 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError("cannot import '%1%', since path '%2%' is not valid, at %3%",
-                        path, e.path, pos);
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("cannot import '%1%', since path '%2%' is not valid",
+                        path, e.path),
+                .nixCode = NixCode { .errPos = pos }
+            });
+
     }
 
     Path realPath = state.checkSourcePath(state.toRealPath(path, context));
@@ -171,8 +176,13 @@ void prim_importNative(EvalState & state, const Pos & pos, Value * * args, Value
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError("cannot import '%1%', since path '%2%' is not valid, at %3%"
-           , path, e.path, pos);
+        throw EvalError(
+            ErrorInfo {
+                .hint = hintfmt(
+                    "cannot import '%1%', since path '%2%' is not valid",
+                   path, e.path),
+                .nixCode = NixCode { .errPos = pos }
+            });
     }
 
     path = state.checkSourcePath(path);
@@ -207,7 +217,11 @@ void prim_exec(EvalState & state, const Pos & pos, Value * * args, Value & v)
     auto elems = args[0]->listElems();
     auto count = args[0]->listSize();
     if (count == 0) {
-        throw EvalError("at least one argument to 'exec' required, at %1%", pos);
+        throw EvalError(
+            ErrorInfo {
+                .hint = hintfmt("at least one argument to 'exec' required"),
+                .nixCode = NixCode { .errPos = pos }
+            });
     }
     PathSet context;
     auto program = state.coerceToString(pos, *elems[0], context, false, false);
@@ -218,9 +232,12 @@ void prim_exec(EvalState & state, const Pos & pos, Value * * args, Value & v)
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError("cannot execute '%1%', since path '%2%' is not valid, at %3%"
-           , program, e.path, pos);
-    }
+        throw EvalError(
+            ErrorInfo {
+                .hint = hintfmt("cannot execute '%1%', since path '%2%' is not valid"
+                     , program, e.path),
+                .nixCode = NixCode { .errPos = pos }
+            });}
 
     auto output = runProgram(program, true, commandArgs);
     Expr * parsed;
@@ -371,7 +388,11 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
     Bindings::iterator startSet =
         args[0]->attrs->find(state.symbols.create("startSet"));
     if (startSet == args[0]->attrs->end())
-        throw EvalError("attribute 'startSet' required, at %1%", pos);
+        throw EvalError(
+            ErrorInfo {
+                .hint = hintfmt("attribute 'startSet' required"),
+                .nixCode = NixCode { .errPos = pos }
+            });
     state.forceList(*startSet->value, pos);
 
     ValueList workSet;
@@ -382,7 +403,11 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
     Bindings::iterator op =
         args[0]->attrs->find(state.symbols.create("operator"));
     if (op == args[0]->attrs->end())
-        throw EvalError("attribute 'operator' required, at %1%", pos);
+        throw EvalError(
+            ErrorInfo {
+                .hint = hintfmt("attribute 'operator' required"),
+                .nixCode = NixCode { .errPos = pos }
+            });
     state.forceValue(*op->value);
 
     /* Construct the closure by applying the operator to element of
@@ -401,7 +426,11 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
         Bindings::iterator key =
             e->attrs->find(state.symbols.create("key"));
         if (key == e->attrs->end())
-            throw EvalError("attribute 'key' required, at %1%", pos);
+            throw EvalError(
+                ErrorInfo {
+                    .hint = hintfmt("attribute 'key' required"),
+                    .nixCode = NixCode { .errPos = pos }
+                });
         state.forceValue(*key->value);
 
         if (!doneKeys.insert(key->value).second) continue;
@@ -533,7 +562,11 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
     /* Figure out the name first (for stack backtraces). */
     Bindings::iterator attr = args[0]->attrs->find(state.sName);
     if (attr == args[0]->attrs->end())
-        throw EvalError("required attribute 'name' missing, at %1%", pos);
+        throw EvalError(
+            ErrorInfo {
+                .hint = hintfmt("required attribute 'name' missing"),
+                .nixCode = NixCode { .errPos = pos }
+            });
     string drvName;
     Pos & posDrvName(*attr->pos);
     try {
@@ -576,25 +609,45 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
         auto handleHashMode = [&](const std::string & s) {
             if (s == "recursive") outputHashRecursive = true;
             else if (s == "flat") outputHashRecursive = false;
-            else throw EvalError("invalid value '%s' for 'outputHashMode' attribute, at %s", s, posDrvName);
+            else 
+                throw EvalError(
+                    ErrorInfo { 
+                        .hint = hintfmt("invalid value '%s' for 'outputHashMode' attribute", s),
+                        .nixCode = NixCode { .errPos = posDrvName }
+                    });
         };
 
         auto handleOutputs = [&](const Strings & ss) {
             outputs.clear();
             for (auto & j : ss) {
                 if (outputs.find(j) != outputs.end())
-                    throw EvalError("duplicate derivation output '%1%', at %2%", j, posDrvName);
+                    throw EvalError(
+                        ErrorInfo { 
+                            .hint = hintfmt("duplicate derivation output '%1%'", j),
+                            .nixCode = NixCode { .errPos = posDrvName }
+                        });
+
+
                 /* !!! Check whether j is a valid attribute
                    name. */
                 /* Derivations cannot be named ‘drv’, because
                    then we'd have an attribute ‘drvPath’ in
                    the resulting set. */
                 if (j == "drv")
-                    throw EvalError("invalid derivation output name 'drv', at %1%", posDrvName);
+                    throw EvalError(
+                        ErrorInfo { 
+                            .hint = hintfmt("invalid derivation output name 'drv'" ),
+                            .nixCode = NixCode { .errPos = posDrvName }
+                        });
+
                 outputs.insert(j);
             }
             if (outputs.empty())
-                throw EvalError("derivation cannot have an empty set of outputs, at %1%", posDrvName);
+                throw EvalError(
+                    ErrorInfo { 
+                        .hint = hintfmt("derivation cannot have an empty set of outputs"),
+                        .nixCode = NixCode { .errPos = posDrvName }
+                    });
         };
 
         try {
@@ -706,18 +759,37 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
 
     /* Do we have all required attributes? */
     if (drv.builder == "")
-        throw EvalError("required attribute 'builder' missing, at %1%", posDrvName);
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("required attribute 'builder' missing"),
+                .nixCode = NixCode { .errPos = posDrvName }
+            });
+
     if (drv.platform == "")
-        throw EvalError("required attribute 'system' missing, at %1%", posDrvName);
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("required attribute 'system' missing"),
+                .nixCode = NixCode { .errPos = posDrvName }
+            });
+
 
     /* Check whether the derivation name is valid. */
     if (isDerivation(drvName))
-        throw EvalError("derivation names are not allowed to end in '%s', at %s", drvExtension, posDrvName);
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("derivation names are not allowed to end in '%s'", drvExtension),
+                .nixCode = NixCode { .errPos = posDrvName }
+            });
+
 
     if (outputHash) {
         /* Handle fixed-output derivations. */
         if (outputs.size() != 1 || *(outputs.begin()) != "out")
-            throw Error("multiple outputs are not supported in fixed-output derivations, at %1%", posDrvName);
+            throw Error(
+                ErrorInfo { 
+                    .hint = hintfmt("multiple outputs are not supported in fixed-output derivations"),
+                    .nixCode = NixCode { .errPos = posDrvName }
+                });
 
         HashType ht = outputHashAlgo.empty() ? htUnknown : parseHashType(outputHashAlgo);
         Hash h(*outputHash, ht);
@@ -818,7 +890,11 @@ static void prim_storePath(EvalState & state, const Pos & pos, Value * * args, V
        e.g. nix-push does the right thing. */
     if (!state.store->isStorePath(path)) path = canonPath(path, true);
     if (!state.store->isInStore(path))
-        throw EvalError("path '%1%' is not in the Nix store, at %2%", path, pos);
+        throw EvalError(
+            ErrorInfo {
+                .hint = hintfmt("path '%1%' is not in the Nix store", path),
+                .nixCode = NixCode { .errPos = pos }
+            });
     Path path2 = state.store->toStorePath(path);
     if (!settings.readOnlyMode)
         state.store->ensurePath(state.store->parseStorePath(path2));
@@ -835,8 +911,12 @@ static void prim_pathExists(EvalState & state, const Pos & pos, Value * * args,
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
         throw EvalError(
-                "cannot check the existence of '%1%', since path '%2%' is not valid, at %3%", 
-                path, e.path, pos);
+            ErrorInfo {
+                .hint = hintfmt(
+                    "cannot check the existence of '%1%', since path '%2%' is not valid", 
+                    path, e.path),
+                .nixCode = NixCode { .errPos = pos }
+            });
     }
 
     try {
@@ -879,9 +959,13 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError("cannot read '%1%', since path '%2%' is not valid, at %3%"
-           , path, e.path, pos);
-    }
+        throw EvalError(
+            ErrorInfo {
+                .hint = hintfmt("cannot read '%1%', since path '%2%' is not valid"
+                     , path, e.path),
+                .nixCode = NixCode { .errPos = pos }
+            });
+ }
     string s = readFile(state.checkSourcePath(state.toRealPath(path, context)));
     if (s.find((char) 0) != string::npos)
         throw Error("the contents of the file '%1%' cannot be represented as a Nix string", path);
@@ -908,7 +992,11 @@ static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Va
 
         i = v2.attrs->find(state.symbols.create("path"));
         if (i == v2.attrs->end())
-            throw EvalError("attribute 'path' missing, at %1%", pos);
+            throw EvalError(
+                ErrorInfo {
+                    .hint = hintfmt("attribute 'path' missing"),
+                    .nixCode = NixCode { .errPos = pos }
+                });
 
         PathSet context;
         string path = state.coerceToString(pos, *i->value, context, false, false);
@@ -916,8 +1004,12 @@ static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Va
         try {
             state.realiseContext(context);
         } catch (InvalidPathError & e) {
-            throw EvalError("cannot find '%1%', since path '%2%' is not valid, at %3%",
-                        path, e.path, pos);
+            throw EvalError(
+                ErrorInfo {
+                    .hint = hintfmt("cannot find '%1%', since path '%2%' is not valid",
+                        path, e.path),
+                    .nixCode = NixCode { .errPos = pos }
+                });
         }
 
         searchPath.emplace_back(prefix, path);
@@ -934,7 +1026,11 @@ static void prim_hashFile(EvalState & state, const Pos & pos, Value * * args, Va
     string type = state.forceStringNoCtx(*args[0], pos);
     HashType ht = parseHashType(type);
     if (ht == htUnknown)
-      throw Error("unknown hash type '%1%', at %2%", type, pos);
+      throw Error(
+          ErrorInfo {
+              .hint = hintfmt("unknown hash type '%1%'", type),
+              .nixCode = NixCode { .errPos = pos }
+          });
 
     PathSet context; // discarded
     Path p = state.coerceToPath(pos, *args[1], context);
@@ -950,8 +1046,12 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val
     try {
         state.realiseContext(ctx);
     } catch (InvalidPathError & e) {
-        throw EvalError("cannot read '%1%', since path '%2%' is not valid, at %3%",
-                        path, e.path, pos);
+        throw EvalError(
+            ErrorInfo {
+                .hint = hintfmt("cannot read '%1%', since path '%2%' is not valid",
+                        path, e.path),
+                .nixCode = NixCode { .errPos = pos }
+            });
     }
 
     DirEntries entries = readDirectory(state.checkSourcePath(path));
@@ -1021,7 +1121,13 @@ static void prim_toFile(EvalState & state, const Pos & pos, Value * * args, Valu
 
     for (auto path : context) {
         if (path.at(0) != '/')
-            throw EvalError("in 'toFile': the file '%1%' cannot refer to derivation outputs, at %2%", name, pos);
+            throw EvalError(
+                ErrorInfo { 
+                    .hint = hintfmt(
+                        "in 'toFile': the file '%1%' cannot refer to derivation outputs",  \
+                        name),
+                    .nixCode = NixCode { .errPos = pos }
+                });
         refs.insert(state.store->parseStorePath(path));
     }
 
@@ -1089,11 +1195,21 @@ static void prim_filterSource(EvalState & state, const Pos & pos, Value * * args
     PathSet context;
     Path path = state.coerceToPath(pos, *args[1], context);
     if (!context.empty())
-        throw EvalError("string '%1%' cannot refer to other paths, at %2%", path, pos);
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("string '%1%' cannot refer to other paths", path),
+                .nixCode = NixCode { .errPos = pos }
+            });
 
     state.forceValue(*args[0]);
     if (args[0]->type != tLambda)
-        throw TypeError("first argument in call to 'filterSource' is not a function but %1%, at %2%", showType(*args[0]), pos);
+        throw TypeError(
+            ErrorInfo { 
+                .hint = hintfmt(
+                    "first argument in call to 'filterSource' is not a function but %1%", 
+                    showType(*args[0])),
+                .nixCode = NixCode { .errPos = pos }
+            });
 
     addPath(state, pos, std::string(baseNameOf(path)), path, args[0], true, Hash(), v);
 }
@@ -1113,7 +1229,13 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
             PathSet context;
             path = state.coerceToPath(*attr.pos, *attr.value, context);
             if (!context.empty())
-                throw EvalError("string '%1%' cannot refer to other paths, at %2%", path, *attr.pos);
+                throw EvalError(
+                    ErrorInfo { 
+                        .hint = hintfmt("string '%1%' cannot refer to other paths", 
+                            path),
+                        .nixCode = NixCode { .errPos = *attr.pos }
+                    });
+
         } else if (attr.name == state.sName)
             name = state.forceStringNoCtx(*attr.value, *attr.pos);
         else if (n == "filter") {
@@ -1124,10 +1246,19 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
         else if (n == "sha256")
             expectedHash = Hash(state.forceStringNoCtx(*attr.value, *attr.pos), htSHA256);
         else
-            throw EvalError("unsupported argument '%1%' to 'addPath', at %2%", attr.name, *attr.pos);
+            throw EvalError(
+                ErrorInfo { 
+                    .hint = hintfmt("unsupported argument '%1%' to 'addPath'",
+                        attr.name),
+                    .nixCode = NixCode { .errPos = *attr.pos }
+                });
     }
     if (path.empty())
-        throw EvalError("'path' required, at %1%", pos);
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("'path' required"),
+                .nixCode = NixCode { .errPos = pos }
+            });
     if (name.empty())
         name = baseNameOf(path);
 
@@ -1185,7 +1316,12 @@ void prim_getAttr(EvalState & state, const Pos & pos, Value * * args, Value & v)
     // !!! Should we create a symbol here or just do a lookup?
     Bindings::iterator i = args[1]->attrs->find(state.symbols.create(attr));
     if (i == args[1]->attrs->end())
-        throw EvalError("attribute '%1%' missing, at %2%", attr, pos);
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("attribute '%1%' missing", attr),
+                .nixCode = NixCode { .errPos = pos }
+            });
+
     // !!! add to stack trace?
     if (state.countCalls && i->pos) state.attrSelects[*i->pos]++;
     state.forceValue(*i->value);
@@ -1265,14 +1401,23 @@ static void prim_listToAttrs(EvalState & state, const Pos & pos, Value * * args,
 
         Bindings::iterator j = v2.attrs->find(state.sName);
         if (j == v2.attrs->end())
-            throw TypeError("'name' attribute missing in a call to 'listToAttrs', at %1%", pos);
+            throw TypeError(
+                ErrorInfo { 
+                    .hint = hintfmt("'name' attribute missing in a call to 'listToAttrs'"), 
+                    .nixCode = NixCode { .errPos = pos }
+                });
+
         string name = state.forceStringNoCtx(*j->value, pos);
 
         Symbol sym = state.symbols.create(name);
         if (seen.insert(sym).second) {
             Bindings::iterator j2 = v2.attrs->find(state.symbols.create(state.sValue));
             if (j2 == v2.attrs->end())
-                throw TypeError("'value' attribute missing in a call to 'listToAttrs', at %1%", pos);
+                throw TypeError(
+                    ErrorInfo { 
+                        .hint = hintfmt("'value' attribute missing in a call to 'listToAttrs'"), 
+                        .nixCode = NixCode { .errPos = pos }
+                    });
 
             v.attrs->push_back(Attr(sym, j2->value, j2->pos));
         }
@@ -1346,7 +1491,12 @@ static void prim_functionArgs(EvalState & state, const Pos & pos, Value * * args
 {
     state.forceValue(*args[0]);
     if (args[0]->type != tLambda)
-        throw TypeError("'functionArgs' requires a function, at %1%", pos);
+        throw TypeError(
+            ErrorInfo { 
+                .hint = hintfmt("'functionArgs' requires a function"), 
+                .nixCode = NixCode { .errPos = pos }
+            });
+
 
     if (!args[0]->lambda.fun->matchAttrs) {
         state.mkAttrs(v, 0);
@@ -1396,7 +1546,12 @@ static void elemAt(EvalState & state, const Pos & pos, Value & list, int n, Valu
 {
     state.forceList(list, pos);
     if (n < 0 || (unsigned int) n >= list.listSize())
-        throw Error("list index %1% is out of bounds, at %2%", n, pos);
+        throw Error(
+            ErrorInfo { 
+                .hint = hintfmt("list index %1% is out of bounds", n), 
+                .nixCode = NixCode { .errPos = pos }
+            });
+
     state.forceValue(*list.listElems()[n]);
     v = *list.listElems()[n];
 }
@@ -1423,7 +1578,12 @@ static void prim_tail(EvalState & state, const Pos & pos, Value * * args, Value
 {
     state.forceList(*args[0], pos);
     if (args[0]->listSize() == 0)
-        throw Error("'tail' called on an empty list, at %1%", pos);
+        throw Error(
+            ErrorInfo { 
+                .hint = hintfmt("'tail' called on an empty list"), 
+                .nixCode = NixCode { .errPos = pos }
+            });
+
     state.mkList(v, args[0]->listSize() - 1);
     for (unsigned int n = 0; n < v.listSize(); ++n)
         v.listElems()[n] = args[0]->listElems()[n + 1];
@@ -1564,7 +1724,12 @@ static void prim_genList(EvalState & state, const Pos & pos, Value * * args, Val
     auto len = state.forceInt(*args[1], pos);
 
     if (len < 0)
-        throw EvalError("cannot create list of size %1%, at %2%", len, pos);
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("cannot create list of size %1%", len), 
+                .nixCode = NixCode { .errPos = pos }
+            });
+
 
     state.mkList(v, len);
 
@@ -1722,7 +1887,12 @@ static void prim_div(EvalState & state, const Pos & pos, Value * * args, Value &
     state.forceValue(*args[1], pos);
 
     NixFloat f2 = state.forceFloat(*args[1], pos);
-    if (f2 == 0) throw EvalError("division by zero, at %1%", pos);
+    if (f2 == 0) 
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("division by zero"), 
+                .nixCode = NixCode { .errPos = pos }
+            });
 
     if (args[0]->type == tFloat || args[1]->type == tFloat) {
         mkFloat(v, state.forceFloat(*args[0], pos) / state.forceFloat(*args[1], pos));
@@ -1731,7 +1901,12 @@ static void prim_div(EvalState & state, const Pos & pos, Value * * args, Value &
         NixInt i2 = state.forceInt(*args[1], pos);
         /* Avoid division overflow as it might raise SIGFPE. */
         if (i1 == std::numeric_limits<NixInt>::min() && i2 == -1)
-            throw EvalError("overflow in integer division, at %1%", pos);
+            throw EvalError(
+                ErrorInfo { 
+                    .hint = hintfmt("overflow in integer division"), 
+                    .nixCode = NixCode { .errPos = pos }
+                });
+
         mkInt(v, i1 / i2);
     }
 }
@@ -1787,7 +1962,12 @@ static void prim_substring(EvalState & state, const Pos & pos, Value * * args, V
     PathSet context;
     string s = state.coerceToString(pos, *args[2], context);
 
-    if (start < 0) throw EvalError("negative start position in 'substring', at %1%", pos);
+    if (start < 0) 
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("negative start position in 'substring'"), 
+                .nixCode = NixCode { .errPos = pos }
+            });
 
     mkString(v, (unsigned int) start >= s.size() ? "" : string(s, start, len), context);
 }
@@ -1807,7 +1987,11 @@ static void prim_hashString(EvalState & state, const Pos & pos, Value * * args,
     string type = state.forceStringNoCtx(*args[0], pos);
     HashType ht = parseHashType(type);
     if (ht == htUnknown)
-      throw Error("unknown hash type '%1%', at %2%", type, pos);
+        throw Error(
+            ErrorInfo { 
+                .hint = hintfmt("unknown hash type '%1%'", type), 
+                .nixCode = NixCode { .errPos = pos }
+            });
 
     PathSet context; // discarded
     string s = state.forceString(*args[1], context, pos);
@@ -1849,10 +2033,18 @@ void prim_match(EvalState & state, const Pos & pos, Value * * args, Value & v)
 
     } catch (std::regex_error &e) {
         if (e.code() == std::regex_constants::error_space) {
-          // limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
-          throw EvalError("memory limit exceeded by regular expression '%s', at %s", re, pos);
+            // limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
+            throw EvalError(
+                ErrorInfo { 
+                    .hint = hintfmt("memory limit exceeded by regular expression '%s'", re), 
+                    .nixCode = NixCode { .errPos = pos }
+                });
         } else {
-          throw EvalError("invalid regular expression '%s', at %s", re, pos);
+          throw EvalError(
+              ErrorInfo { 
+                  .hint = hintfmt("invalid regular expression '%s'", re), 
+                  .nixCode = NixCode { .errPos = pos }
+              });
         }
     }
 }
@@ -1917,10 +2109,18 @@ static void prim_split(EvalState & state, const Pos & pos, Value * * args, Value
     } catch (std::regex_error &e) {
         if (e.code() == std::regex_constants::error_space) {
           // limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
-          throw EvalError("memory limit exceeded by regular expression '%s', at %s", re, pos);
-        } else {
-          throw EvalError("invalid regular expression '%s', at %s", re, pos);
-        }
+          throw EvalError(
+              ErrorInfo { 
+                  .hint = hintfmt("memory limit exceeded by regular expression '%s'", re), 
+                  .nixCode = NixCode { .errPos = pos }
+              });
+         } else {
+          throw EvalError(
+              ErrorInfo { 
+                  .hint = hintfmt("invalid regular expression '%s'", re), 
+                  .nixCode = NixCode { .errPos = pos }
+              });
+         }
     }
 }
 
@@ -1950,7 +2150,11 @@ static void prim_replaceStrings(EvalState & state, const Pos & pos, Value * * ar
     state.forceList(*args[0], pos);
     state.forceList(*args[1], pos);
     if (args[0]->listSize() != args[1]->listSize())
-        throw EvalError("'from' and 'to' arguments to 'replaceStrings' have different lengths, at %1%", pos);
+        throw EvalError(
+            ErrorInfo { 
+                .hint = hintfmt("'from' and 'to' arguments to 'replaceStrings' have different lengths"), 
+                .nixCode = NixCode { .errPos = pos }
+            });
 
     vector<string> from;
     from.reserve(args[0]->listSize());
@@ -2072,11 +2276,20 @@ void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
             else if (n == "name")
                 request.name = state.forceStringNoCtx(*attr.value, *attr.pos);
             else
-                throw EvalError("unsupported argument '%1%' to '%2%', at %3%", attr.name, who, attr.pos);
+                throw EvalError(
+                    ErrorInfo { 
+                        .hint = hintfmt("unsupported argument '%1%' to '%2%'", attr.name, who), 
+                        .nixCode = NixCode { .errPos = pos }
+                    });
+
         }
 
         if (request.uri.empty())
-            throw EvalError("'url' argument required, at %1%", pos);
+            throw EvalError(
+                ErrorInfo { 
+                    .hint = hintfmt("'url' argument required"), 
+                    .nixCode = NixCode { .errPos = pos }
+                });
 
     } else
         request.uri = state.forceStringNoCtx(*args[0], pos);
diff --git a/src/libexpr/primops/context.cc b/src/libexpr/primops/context.cc
index 94fa0158c..768936453 100644
--- a/src/libexpr/primops/context.cc
+++ b/src/libexpr/primops/context.cc
@@ -146,7 +146,12 @@ static void prim_appendContext(EvalState & state, const Pos & pos, Value * * arg
     auto sAllOutputs = state.symbols.create("allOutputs");
     for (auto & i : *args[1]->attrs) {
         if (!state.store->isStorePath(i.name))
-            throw EvalError("Context key '%s' is not a store path, at %s", i.name, i.pos);
+            throw EvalError(
+                ErrorInfo { 
+                    .hint = hintfmt("Context key '%s' is not a store path", i.name),
+                    .nixCode = NixCode { .errPos = *i.pos }
+                });
+
         if (!settings.readOnlyMode)
             state.store->ensurePath(state.store->parseStorePath(i.name));
         state.forceAttrs(*i.value, *i.pos);
@@ -160,7 +165,12 @@ static void prim_appendContext(EvalState & state, const Pos & pos, Value * * arg
         if (iter != i.value->attrs->end()) {
             if (state.forceBool(*iter->value, *iter->pos)) {
                 if (!isDerivation(i.name)) {
-                    throw EvalError("Tried to add all-outputs context of %s, which is not a derivation, to a string, at %s", i.name, i.pos);
+                    throw EvalError(
+                        ErrorInfo { 
+                            .hint = hintfmt("Tried to add all-outputs context of %s, which is not a derivation, to a string", i.name),
+                            .nixCode = NixCode { .errPos = *i.pos }
+                        });
+
                 }
                 context.insert("=" + string(i.name));
             }
@@ -170,7 +180,11 @@ static void prim_appendContext(EvalState & state, const Pos & pos, Value * * arg
         if (iter != i.value->attrs->end()) {
             state.forceList(*iter->value, *iter->pos);
             if (iter->value->listSize() && !isDerivation(i.name)) {
-                throw EvalError("Tried to add derivation output context of %s, which is not a derivation, to a string, at %s", i.name, i.pos);
+                throw EvalError(
+                    ErrorInfo { 
+                        .hint = hintfmt("Tried to add derivation output context of %s, which is not a derivation, to a string", i.name),
+                        .nixCode = NixCode { .errPos = *i.pos }
+                    });
             }
             for (unsigned int n = 0; n < iter->value->listSize(); ++n) {
                 auto name = state.forceStringNoCtx(*iter->value->listElems()[n], *iter->pos);
diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc
index 480cc1adc..68ffed513 100644
--- a/src/libexpr/primops/fetchGit.cc
+++ b/src/libexpr/primops/fetchGit.cc
@@ -217,11 +217,19 @@ static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Va
             else if (n == "name")
                 name = state.forceStringNoCtx(*attr.value, *attr.pos);
             else
-                throw EvalError("unsupported argument '%s' to 'fetchGit', at %s", attr.name, *attr.pos);
+                throw EvalError(
+                    ErrorInfo { 
+                        .hint = hintfmt("unsupported argument '%s' to 'fetchGit'", attr.name),
+                        .nixCode = NixCode { .errPos = *attr.pos }
+                    });
         }
 
         if (url.empty())
-            throw EvalError("'url' argument required, at %1%", pos);
+            throw EvalError(
+                ErrorInfo { 
+                    .hint = hintfmt("'url' argument required"),
+                    .nixCode = NixCode { .errPos = pos }
+                });
 
     } else
         url = state.coerceToString(pos, *args[0], context, false, false);
diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc
index 76029f548..ce99928e2 100644
--- a/src/libexpr/primops/fetchMercurial.cc
+++ b/src/libexpr/primops/fetchMercurial.cc
@@ -187,11 +187,20 @@ static void prim_fetchMercurial(EvalState & state, const Pos & pos, Value * * ar
             else if (n == "name")
                 name = state.forceStringNoCtx(*attr.value, *attr.pos);
             else
-                throw EvalError("unsupported argument '%s' to 'fetchMercurial', at %s", attr.name, *attr.pos);
+                throw EvalError(
+                    ErrorInfo { 
+                        .hint = hintfmt("unsupported argument '%s' to 'fetchMercurial'", attr.name),
+                        .nixCode = NixCode { .errPos = *attr.pos }
+                    });
+
         }
 
         if (url.empty())
-            throw EvalError("'url' argument required, at %1%", pos);
+            throw EvalError(
+                ErrorInfo { 
+                    .hint = hintfmt("'url' argument required"),
+                    .nixCode = NixCode { .errPos = pos }
+                });
 
     } else
         url = state.coerceToString(pos, *args[0], context, false, false);
-- 
cgit v1.2.3


From b93c1bf3d67716231d2ff7ee4154b8c80a251b10 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Mon, 11 May 2020 15:52:15 -0600
Subject: fixes to merged code

---
 src/libexpr/nixexpr.hh | 1 +
 src/libexpr/primops.cc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index 137fe7198..a185d5785 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -2,6 +2,7 @@
 
 #include "value.hh"
 #include "symbol-table.hh"
+#include "error.hh"
 
 #include <map>
 
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 10e8c6b42..657ce3001 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -1124,7 +1124,7 @@ static void prim_toFile(EvalState & state, const Pos & pos, Value * * args, Valu
                 ErrorInfo { 
                     .hint = hintfmt(
                         "in 'toFile': the file named '%1%' must not contain a reference "
-                        "to a derivation but contains (%2%)"
+                        "to a derivation but contains (%2%)",
                         name,
                         path),
                     .nixCode = NixCode { .errPos = pos }
-- 
cgit v1.2.3


From 631642c5b40032a087b8e2e131b2ebcac00913d3 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Mon, 11 May 2020 16:58:08 -0600
Subject: new format for pos

---
 src/libexpr/parser.y | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 82d5753ab..6d50d74ba 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -64,15 +64,23 @@ namespace nix {
 
 static void dupAttr(const AttrPath & attrPath, const Pos & pos, const Pos & prevPos)
 {
-    throw ParseError("attribute '%1%' at %2% already defined at %3%",
-        showAttrPath(attrPath), pos, prevPos);
+    throw ParseError(
+        ErrorInfo {
+            .hint = hintfmt("attribute '%1%' already defined at %2%",
+                showAttrPath(attrPath), prevPos),
+            .nixCode = NixCode { .errPos = pos },
+        });
 }
 
 
 static void dupAttr(Symbol attr, const Pos & pos, const Pos & prevPos)
 {
-    throw ParseError("attribute '%1%' at %2% already defined at %3%",
-        attr, pos, prevPos);
+    throw ParseError(
+        ErrorInfo {
+            .hint = hintfmt("attribute '%1%' already defined at %2%",
+                attr, prevPos),
+            .nixCode = NixCode { .errPos = pos },
+        });
 }
 
 
@@ -140,8 +148,12 @@ static void addAttr(ExprAttrs * attrs, AttrPath & attrPath,
 static void addFormal(const Pos & pos, Formals * formals, const Formal & formal)
 {
     if (!formals->argNames.insert(formal.name).second)
-        throw ParseError("duplicate formal function argument '%1%' at %2%",
-            formal.name, pos);
+        throw ParseError(
+            ErrorInfo {
+                .hint = hintfmt("duplicate formal function argument '%1%'",
+                    formal.name),
+                .nixCode = NixCode { .errPos = pos },
+            });
     formals->formals.push_front(formal);
 }
 
@@ -327,7 +339,11 @@ expr_function
     { $$ = new ExprWith(CUR_POS, $2, $4); }
   | LET binds IN expr_function
     { if (!$2->dynamicAttrs.empty())
-        throw ParseError("dynamic attributes not allowed in let at %1%", CUR_POS);
+        throw ParseError(
+            ErrorInfo {
+                .hint = hintfmt("dynamic attributes not allowed in let"),
+                .nixCode = NixCode { .errPos = CUR_POS },
+            });
       $$ = new ExprLet($2, $4);
     }
   | expr_if
@@ -479,8 +495,11 @@ attrs
           $$->push_back(AttrName(str->s));
           delete str;
       } else
-          throw ParseError("dynamic attributes not allowed in inherit at %1%",
-              makeCurPos(@2, data));
+          throw ParseError(
+              ErrorInfo {
+                  .hint = hintfmt("dynamic attributes not allowed in inherit"),
+                  .nixCode = NixCode { .errPos = makeCurPos(@2, data) },
+              });
     }
   | { $$ = new AttrPath; }
   ;
-- 
cgit v1.2.3


From 7c3138844ca9ab92e2f231a7d17d7aee420ae76e Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Mon, 11 May 2020 17:34:57 -0600
Subject: more pos reporting

---
 src/libexpr/nixexpr.cc | 8 ++++++--
 src/libexpr/parser.y   | 8 +++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index a9955f6df..91a508305 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -267,8 +267,12 @@ void ExprVar::bindVars(const StaticEnv & env)
     /* Otherwise, the variable must be obtained from the nearest
        enclosing `with'.  If there is no `with', then we can issue an
        "undefined variable" error now. */
-    if (withLevel == -1) throw UndefinedVarError("undefined variable '%1%' at %2%", name, pos);
-
+    if (withLevel == -1) 
+        throw UndefinedVarError(
+            ErrorInfo {
+                .hint = hintfmt("undefined variable '%1%'", name),
+                .nixCode = NixCode { .errPos = pos }
+            });
     fromWith = true;
     this->level = withLevel;
 }
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 6d50d74ba..3ae7bbafd 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -31,7 +31,7 @@ namespace nix {
         Expr * result;
         Path basePath;
         Symbol path;
-        string error;
+        ErrorInfo error;
         Symbol sLetBody;
         ParseData(EvalState & state)
             : state(state)
@@ -261,8 +261,10 @@ static inline Pos makeCurPos(const YYLTYPE & loc, ParseData * data)
 
 void yyerror(YYLTYPE * loc, yyscan_t scanner, ParseData * data, const char * error)
 {
-    data->error = (format("%1%, at %2%")
-        % error % makeCurPos(*loc, data)).str();
+    data->error = ErrorInfo { 
+        .hint = hintfmt(error),
+        .nixCode = NixCode { .errPos = makeCurPos(*loc, data) }
+        };
 }
 
 
-- 
cgit v1.2.3


From ec870b9c853ad86fb1ccb482ca87802f1b155a2c Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Tue, 12 May 2020 10:52:26 -0600
Subject: new pos format for more errors

---
 src/libexpr/eval.cc              | 11 ++++++++---
 src/libexpr/nixexpr.hh           |  6 +++++-
 src/libexpr/primops/fetchTree.cc | 23 +++++++++++++++++------
 src/libexpr/primops/fromTOML.cc  |  6 +++++-
 4 files changed, 35 insertions(+), 11 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 65071206f..7af665118 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -529,7 +529,12 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, con
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const Symbol & sym, const Pos & p1, const Pos & p2))
 {
-    throw EvalError(s, sym, p1, p2);
+    // p1 is where the error occurred; p2 is a position mentioned in the message.
+    throw EvalError(
+        ErrorInfo { 
+            .hint = hintfmt(s, sym, p2),
+            .nixCode = NixCode { .errPos = p1 }
+        });
 }
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const Pos & pos))
@@ -638,7 +643,7 @@ inline Value * EvalState::lookupVar(Env * env, const ExprVar & var, bool noEval)
             return j->value;
         }
         if (!env->prevWith)
-            throwUndefinedVarError("undefined variable '%1%' at %2%", var.name, var.pos);
+            throwUndefinedVarError("undefined variable '%1%'", var.name, var.pos);
         for (size_t l = env->prevWith; l; --l, env = env->up) ;
     }
 }
@@ -950,7 +955,7 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v)
         Symbol nameSym = state.symbols.create(nameVal.string.s);
         Bindings::iterator j = v.attrs->find(nameSym);
         if (j != v.attrs->end())
-            throwEvalError("dynamic attribute '%1%' at %2% already defined at %3%", nameSym, i.pos, *j->pos);
+            throwEvalError("dynamic attribute '%1%' already defined at %2%", nameSym, i.pos, *j->pos);
 
         i.valueExpr->setName(nameSym);
         /* Keep sorted order so find can catch duplicates */
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index a185d5785..47d0e85ec 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -236,7 +236,11 @@ struct ExprLambda : Expr
         : pos(pos), arg(arg), matchAttrs(matchAttrs), formals(formals), body(body)
     {
         if (!arg.empty() && formals && formals->argNames.find(arg) != formals->argNames.end())
-            throw ParseError("duplicate formal function argument '%1%' at %2%", arg, pos);
+            throw ParseError(
+                ErrorInfo {
+                    .hint = hintfmt("duplicate formal function argument '%1%'", arg),
+                    .nixCode = NixCode { .errPos = pos }
+                });
     };
     void setName(Symbol & name);
     string showNamePos() const;
diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc
index c5a0d9886..af3b61d6a 100644
--- a/src/libexpr/primops/fetchTree.cc
+++ b/src/libexpr/primops/fetchTree.cc
@@ -66,7 +66,11 @@ static void prim_fetchTree(EvalState & state, const Pos & pos, Value * * args, V
         }
 
         if (!attrs.count("type"))
-            throw Error("attribute 'type' is missing in call to 'fetchTree', at %s", pos);
+            throw Error(
+                ErrorInfo {
+                    .hint = hintfmt("attribute 'type' is missing in call to 'fetchTree'"),
+                    .nixCode = NixCode { .errPos = pos }
+                    });
 
         input = fetchers::inputFromAttrs(attrs);
     } else
@@ -107,13 +111,20 @@ static void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
             else if (n == "name")
                 name = state.forceStringNoCtx(*attr.value, *attr.pos);
             else
-                throw EvalError("unsupported argument '%s' to '%s', at %s",
-                    attr.name, who, *attr.pos);
-        }
+                throw EvalError(
+                    ErrorInfo {
+                        .hint = hintfmt("unsupported argument '%s' to '%s'",
+                            attr.name, who),
+                        .nixCode = NixCode { .errPos = *attr.pos }
+                    });
+            }
 
         if (!url)
-            throw EvalError("'url' argument required, at %s", pos);
-
+            throw EvalError(
+                ErrorInfo {
+                    .hint = hintfmt("'url' argument required"),
+                    .nixCode = NixCode { .errPos = pos }
+                });
     } else
         url = state.forceStringNoCtx(*args[0], pos);
 
diff --git a/src/libexpr/primops/fromTOML.cc b/src/libexpr/primops/fromTOML.cc
index c43324dbb..948069401 100644
--- a/src/libexpr/primops/fromTOML.cc
+++ b/src/libexpr/primops/fromTOML.cc
@@ -81,7 +81,11 @@ static void prim_fromTOML(EvalState & state, const Pos & pos, Value * * args, Va
     try {
         visit(v, parser(tomlStream).parse());
     } catch (std::runtime_error & e) {
-        throw EvalError("while parsing a TOML string at %s: %s", pos, e.what());
+        throw EvalError(
+            ErrorInfo {
+                .hint = hintfmt("while parsing a TOML string: %s", e.what()),
+                .nixCode = NixCode { .errPos = pos }
+            });
     }
 }
 
-- 
cgit v1.2.3


From 2a19bf86197083e17d9b35596c21e3c1b3f4a170 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Tue, 12 May 2020 11:27:37 -0600
Subject: move pos to the first arg, to indicate its not used in a fmt template

---
 src/libexpr/eval-inline.hh | 10 ++++----
 src/libexpr/eval.cc        | 58 +++++++++++++++++++++++-----------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/eval-inline.hh b/src/libexpr/eval-inline.hh
index e6b838665..eee49e02e 100644
--- a/src/libexpr/eval-inline.hh
+++ b/src/libexpr/eval-inline.hh
@@ -7,7 +7,7 @@
 
 namespace nix {
 
-LocalNoInlineNoReturn(void throwEvalError(const char * s, const Pos & pos))
+LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s))
 {
     throw EvalError(
         ErrorInfo { 
@@ -22,7 +22,7 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v))
 }
 
 
-LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v, const Pos & pos))
+LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const Value & v))
 {
     throw TypeError(
         ErrorInfo { 
@@ -51,7 +51,7 @@ void EvalState::forceValue(Value & v, const Pos & pos)
     else if (v.type == tApp)
         callFunction(*v.app.left, *v.app.right, v, noPos);
     else if (v.type == tBlackhole)
-        throwEvalError("infinite recursion encountered", pos);
+        throwEvalError(pos, "infinite recursion encountered");
 }
 
 
@@ -67,7 +67,7 @@ inline void EvalState::forceAttrs(Value & v, const Pos & pos)
 {
     forceValue(v, pos);
     if (v.type != tAttrs)
-        throwTypeError("value is %1% while a set was expected", v, pos);
+        throwTypeError(pos, "value is %1% while a set was expected", v);
 }
 
 
@@ -83,7 +83,7 @@ inline void EvalState::forceList(Value & v, const Pos & pos)
 {
     forceValue(v, pos);
     if (!v.isList())
-        throwTypeError("value is %1% while a list was expected", v, pos);
+        throwTypeError(pos, "value is %1% while a list was expected", v);
 }
 
 /* Note: Various places expect the allocated memory to be zeroed. */
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 7af665118..e4bc6dc83 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -504,7 +504,7 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2))
     throw EvalError(s, s2);
 }
 
-LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const Pos & pos))
+LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const string & s2))
 {
     throw EvalError(
         ErrorInfo { 
@@ -518,7 +518,7 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, con
     throw EvalError(s, s2, s3);
 }
 
-LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const string & s3, const Pos & pos))
+LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const string & s2, const string & s3))
 {
     throw EvalError(
         ErrorInfo { 
@@ -527,7 +527,7 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, con
         });
 }
 
-LocalNoInlineNoReturn(void throwEvalError(const char * s, const Symbol & sym, const Pos & p1, const Pos & p2))
+LocalNoInlineNoReturn(void throwEvalError(const Pos & p1, const char * s, const Symbol & sym, const Pos & p2))
 {
     // p1 is where the error occurred; p2 is a position mentioned in the message.
     throw EvalError(
@@ -537,7 +537,7 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const Symbol & sym, co
         });
 }
 
-LocalNoInlineNoReturn(void throwTypeError(const char * s, const Pos & pos))
+LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s))
 {
     throw TypeError(
         ErrorInfo { 
@@ -551,7 +551,7 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1))
     throw TypeError(s, s1);
 }
 
-LocalNoInlineNoReturn(void throwTypeError(const char * s, const ExprLambda & fun, const Symbol & s2, const Pos & pos))
+LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const ExprLambda & fun, const Symbol & s2))
 {
     throw TypeError(
         ErrorInfo { 
@@ -560,7 +560,7 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const ExprLambda & fun
         });
 }
 
-LocalNoInlineNoReturn(void throwAssertionError(const char * s, const string & s1, const Pos & pos))
+LocalNoInlineNoReturn(void throwAssertionError(const Pos & pos, const char * s, const string & s1))
 {
     throw AssertionError(
         ErrorInfo { 
@@ -569,7 +569,7 @@ LocalNoInlineNoReturn(void throwAssertionError(const char * s, const string & s1
         });
 }
 
-LocalNoInlineNoReturn(void throwUndefinedVarError(const char * s, const string & s1, const Pos & pos))
+LocalNoInlineNoReturn(void throwUndefinedVarError(const Pos & pos, const char * s, const string & s1))
 {
     throw UndefinedVarError(
         ErrorInfo { 
@@ -643,7 +643,7 @@ inline Value * EvalState::lookupVar(Env * env, const ExprVar & var, bool noEval)
             return j->value;
         }
         if (!env->prevWith)
-            throwUndefinedVarError("undefined variable '%1%'", var.name, var.pos);
+            throwUndefinedVarError(var.pos, "undefined variable '%1%'", var.name);
         for (size_t l = env->prevWith; l; --l, env = env->up) ;
     }
 }
@@ -841,7 +841,7 @@ inline bool EvalState::evalBool(Env & env, Expr * e, const Pos & pos)
     Value v;
     e->eval(*this, env, v);
     if (v.type != tBool)
-        throwTypeError("value is %1% while a Boolean was expected", v, pos);
+        throwTypeError(pos, "value is %1% while a Boolean was expected", v);
     return v.boolean;
 }
 
@@ -955,7 +955,7 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v)
         Symbol nameSym = state.symbols.create(nameVal.string.s);
         Bindings::iterator j = v.attrs->find(nameSym);
         if (j != v.attrs->end())
-            throwEvalError("dynamic attribute '%1%' already defined at %2%", nameSym, i.pos, *j->pos);
+            throwEvalError(i.pos, "dynamic attribute '%1%' already defined at %2%", nameSym, *j->pos);
 
         i.valueExpr->setName(nameSym);
         /* Keep sorted order so find can catch duplicates */
@@ -1043,7 +1043,7 @@ void ExprSelect::eval(EvalState & state, Env & env, Value & v)
             } else {
                 state.forceAttrs(*vAttrs, pos);
                 if ((j = vAttrs->attrs->find(name)) == vAttrs->attrs->end())
-                    throwEvalError("attribute '%1%' missing", name, pos);
+                    throwEvalError(pos, "attribute '%1%' missing", name);
             }
             vAttrs = j->value;
             pos2 = j->pos;
@@ -1169,7 +1169,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
     }
 
     if (fun.type != tLambda)
-        throwTypeError("attempt to call something which is not a function but %1%", fun, pos);
+        throwTypeError(pos, "attempt to call something which is not a function but %1%", fun);
 
     ExprLambda & lambda(*fun.lambda.fun);
 
@@ -1197,8 +1197,8 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
         for (auto & i : lambda.formals->formals) {
             Bindings::iterator j = arg.attrs->find(i.name);
             if (j == arg.attrs->end()) {
-                if (!i.def) throwTypeError("%1% called without required argument '%2%'",
-                    lambda, i.name, pos);
+                if (!i.def) throwTypeError(pos, "%1% called without required argument '%2%'",
+                    lambda, i.name);
                 env2.values[displ++] = i.def->maybeThunk(*this, env2);
             } else {
                 attrsUsed++;
@@ -1213,7 +1213,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
                user. */
             for (auto & i : *arg.attrs)
                 if (lambda.formals->argNames.find(i.name) == lambda.formals->argNames.end())
-                    throwTypeError("%1% called with unexpected argument '%2%'", lambda, i.name, pos);
+                    throwTypeError(pos, "%1% called with unexpected argument '%2%'", lambda, i.name);
             abort(); // can't happen
         }
     }
@@ -1302,7 +1302,7 @@ void ExprAssert::eval(EvalState & state, Env & env, Value & v)
     if (!state.evalBool(env, cond, pos)) {
         std::ostringstream out;
         cond->show(out);
-        throwAssertionError("assertion '%1%' failed at %2%", out.str(), pos);
+        throwAssertionError(pos, "assertion '%1%' failed at %2%", out.str());
     }
     body->eval(state, env, v);
 }
@@ -1454,14 +1454,14 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
                 nf = n;
                 nf += vTmp.fpoint;
             } else
-                throwEvalError("cannot add %1% to an integer", showType(vTmp), pos);
+                throwEvalError(pos, "cannot add %1% to an integer", showType(vTmp));
         } else if (firstType == tFloat) {
             if (vTmp.type == tInt) {
                 nf += vTmp.integer;
             } else if (vTmp.type == tFloat) {
                 nf += vTmp.fpoint;
             } else
-                throwEvalError("cannot add %1% to a float", showType(vTmp), pos);
+                throwEvalError(pos, "cannot add %1% to a float", showType(vTmp));
         } else
             s << state.coerceToString(pos, vTmp, context, false, firstType == tString);
     }
@@ -1472,7 +1472,7 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
         mkFloat(v, nf);
     else if (firstType == tPath) {
         if (!context.empty())
-            throwEvalError("a string that refers to a store path cannot be appended to a path", pos);
+            throwEvalError(pos, "a string that refers to a store path cannot be appended to a path");
         auto path = canonPath(s.str());
         mkPath(v, path.c_str());
     } else
@@ -1521,7 +1521,7 @@ NixInt EvalState::forceInt(Value & v, const Pos & pos)
 {
     forceValue(v, pos);
     if (v.type != tInt)
-        throwTypeError("value is %1% while an integer was expected", v, pos);
+        throwTypeError(pos, "value is %1% while an integer was expected", v);
     return v.integer;
 }
 
@@ -1532,7 +1532,7 @@ NixFloat EvalState::forceFloat(Value & v, const Pos & pos)
     if (v.type == tInt)
         return v.integer;
     else if (v.type != tFloat)
-        throwTypeError("value is %1% while a float was expected", v, pos);
+        throwTypeError(pos, "value is %1% while a float was expected", v);
     return v.fpoint;
 }
 
@@ -1541,7 +1541,7 @@ bool EvalState::forceBool(Value & v, const Pos & pos)
 {
     forceValue(v, pos);
     if (v.type != tBool)
-        throwTypeError("value is %1% while a Boolean was expected", v, pos);
+        throwTypeError(pos, "value is %1% while a Boolean was expected", v);
     return v.boolean;
 }
 
@@ -1556,7 +1556,7 @@ void EvalState::forceFunction(Value & v, const Pos & pos)
 {
     forceValue(v, pos);
     if (v.type != tLambda && v.type != tPrimOp && v.type != tPrimOpApp && !isFunctor(v))
-        throwTypeError("value is %1% while a function was expected", v, pos);
+        throwTypeError(pos, "value is %1% while a function was expected", v);
 }
 
 
@@ -1565,7 +1565,7 @@ string EvalState::forceString(Value & v, const Pos & pos)
     forceValue(v, pos);
     if (v.type != tString) {
         if (pos)
-            throwTypeError("value is %1% while a string was expected", v, pos);
+            throwTypeError(pos, "value is %1% while a string was expected", v);
         else
             throwTypeError("value is %1% while a string was expected", v);
     }
@@ -1594,8 +1594,8 @@ string EvalState::forceStringNoCtx(Value & v, const Pos & pos)
     string s = forceString(v, pos);
     if (v.string.context) {
         if (pos)
-            throwEvalError("the string '%1%' is not allowed to refer to a store path (such as '%2%')",
-                v.string.s, v.string.context[0], pos);
+            throwEvalError(pos, "the string '%1%' is not allowed to refer to a store path (such as '%2%')", 
+                v.string.s, v.string.context[0]);
         else
             throwEvalError("the string '%1%' is not allowed to refer to a store path (such as '%2%')",
                 v.string.s, v.string.context[0]);
@@ -1651,7 +1651,7 @@ string EvalState::coerceToString(const Pos & pos, Value & v, PathSet & context,
             return *maybeString;
         }
         auto i = v.attrs->find(sOutPath);
-        if (i == v.attrs->end()) throwTypeError("cannot coerce a set to a string", pos);
+        if (i == v.attrs->end()) throwTypeError(pos, "cannot coerce a set to a string");
         return coerceToString(pos, *i->value, context, coerceMore, copyToStore);
     }
 
@@ -1682,7 +1682,7 @@ string EvalState::coerceToString(const Pos & pos, Value & v, PathSet & context,
         }
     }
 
-    throwTypeError("cannot coerce %1% to a string", v, pos);
+    throwTypeError(pos, "cannot coerce %1% to a string", v);
 }
 
 
@@ -1713,7 +1713,7 @@ Path EvalState::coerceToPath(const Pos & pos, Value & v, PathSet & context)
 {
     string path = coerceToString(pos, v, context, false, false);
     if (path == "" || path[0] != '/')
-        throwEvalError("string '%1%' doesn't represent an absolute path", path, pos);
+        throwEvalError(pos, "string '%1%' doesn't represent an absolute path", path);
     return path;
 }
 
-- 
cgit v1.2.3


From 72ecccee5781ec0b57b2860f677b8a64db43cda7 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Tue, 12 May 2020 12:19:34 -0600
Subject: convert to logWarning format

---
 src/libexpr/parser.y | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 3ae7bbafd..49fb8ad37 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -717,7 +717,11 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
             res = { true, store->toRealPath(fetchers::downloadTarball(
                         store, resolveUri(elem.second), "source", false).storePath) };
         } catch (FileTransferError & e) {
-            printError("warning: Nix search path entry '%1%' cannot be downloaded, ignoring", elem.second);
+            logWarning(
+                ErrorInfo { 
+                    .name = "Entry download",
+                    .hint = hintfmt("Nix search path entry '%1%' cannot be downloaded, ignoring", elem.second)
+            });
             res = { false, "" };
         }
     } else {
@@ -727,7 +731,7 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
         else {
             logWarning(
                 ErrorInfo { 
-                    .name = "Search path not found",
+                    .name = "Entry not found",
                     .hint = hintfmt("warning: Nix search path entry '%1%' does not exist, ignoring", elem.second)
             });
             res = { false, "" };
-- 
cgit v1.2.3


From ef9dd9f9bc18abc9761812e30a26008c99a26166 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Wed, 13 May 2020 15:56:39 -0600
Subject: formatting and a few minor changes

---
 src/libexpr/parser.y                  |  2 --
 src/libexpr/primops.cc                | 59 +++++++++++++++--------------------
 src/libexpr/primops/context.cc        |  2 --
 src/libexpr/primops/fetchMercurial.cc |  1 -
 4 files changed, 25 insertions(+), 39 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 49fb8ad37..0417a3c21 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -427,7 +427,6 @@ expr_simple
                   .hint = hintfmt("URL literals are disabled"),
                   .nixCode = NixCode { .errPos = CUR_POS }
               });
-
       $$ = new ExprString(data->symbols.create($1));
   }
   | '(' expr ')' { $$ = $2; }
@@ -696,7 +695,6 @@ Path EvalState::findFile(SearchPath & searchPath, const string & path, const Pos
         Path res = r.second + suffix;
         if (pathExists(res)) return canonPath(res);
     }
-
     throw ThrownError(
         ErrorInfo { 
             .hint = hintfmt("file '%1%' was not found in the Nix search path (add it using $NIX_PATH or -I)", path),
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 657ce3001..d21c49813 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -99,7 +99,6 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
                         path, e.path),
                 .nixCode = NixCode { .errPos = pos }
             });
-
     }
 
     Path realPath = state.checkSourcePath(state.toRealPath(path, context));
@@ -179,7 +178,7 @@ void prim_importNative(EvalState & state, const Pos & pos, Value * * args, Value
             ErrorInfo {
                 .hint = hintfmt(
                     "cannot import '%1%', since path '%2%' is not valid",
-                   path, e.path),
+                    path, e.path),
                 .nixCode = NixCode { .errPos = pos }
             });
     }
@@ -199,8 +198,8 @@ void prim_importNative(EvalState & state, const Pos & pos, Value * * args, Value
         if (message)
             throw EvalError("could not load symbol '%1%' from '%2%': %3%", sym, path, message);
         else
-            throw EvalError("symbol '%1%' from '%2%' resolved to NULL when a function pointer was expected"
-                   , sym, path);
+            throw EvalError("symbol '%1%' from '%2%' resolved to NULL when a function pointer was expected",
+                sym, path);
     }
 
     (func)(state, v);
@@ -233,8 +232,8 @@ void prim_exec(EvalState & state, const Pos & pos, Value * * args, Value & v)
     } catch (InvalidPathError & e) {
         throw EvalError(
             ErrorInfo {
-                .hint = hintfmt("cannot execute '%1%', since path '%2%' is not valid"
-                     , program, e.path),
+                .hint = hintfmt("cannot execute '%1%', since path '%2%' is not valid",
+                    program, e.path),
                 .nixCode = NixCode { .errPos = pos }
             });}
 
@@ -625,8 +624,6 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
                             .hint = hintfmt("duplicate derivation output '%1%'", j),
                             .nixCode = NixCode { .errPos = posDrvName }
                         });
-
-
                 /* !!! Check whether j is a valid attribute
                    name. */
                 /* Derivations cannot be named ‘drv’, because
@@ -638,7 +635,6 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
                             .hint = hintfmt("invalid derivation output name 'drv'" ),
                             .nixCode = NixCode { .errPos = posDrvName }
                         });
-
                 outputs.insert(j);
             }
             if (outputs.empty())
@@ -1236,7 +1232,6 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
                             path),
                         .nixCode = NixCode { .errPos = *attr.pos }
                     });
-
         } else if (attr.name == state.sName)
             name = state.forceStringNoCtx(*attr.value, *attr.pos);
         else if (n == "filter") {
@@ -1322,7 +1317,6 @@ void prim_getAttr(EvalState & state, const Pos & pos, Value * * args, Value & v)
                 .hint = hintfmt("attribute '%1%' missing", attr),
                 .nixCode = NixCode { .errPos = pos }
             });
-
     // !!! add to stack trace?
     if (state.countCalls && i->pos) state.attrSelects[*i->pos]++;
     state.forceValue(*i->value, pos);
@@ -1407,7 +1401,6 @@ static void prim_listToAttrs(EvalState & state, const Pos & pos, Value * * args,
                     .hint = hintfmt("'name' attribute missing in a call to 'listToAttrs'"), 
                     .nixCode = NixCode { .errPos = pos }
                 });
-
         string name = state.forceStringNoCtx(*j->value, pos);
 
         Symbol sym = state.symbols.create(name);
@@ -1419,7 +1412,6 @@ static void prim_listToAttrs(EvalState & state, const Pos & pos, Value * * args,
                         .hint = hintfmt("'value' attribute missing in a call to 'listToAttrs'"), 
                         .nixCode = NixCode { .errPos = pos }
                     });
-
             v.attrs->push_back(Attr(sym, j2->value, j2->pos));
         }
     }
@@ -1498,7 +1490,6 @@ static void prim_functionArgs(EvalState & state, const Pos & pos, Value * * args
                 .nixCode = NixCode { .errPos = pos }
             });
 
-
     if (!args[0]->lambda.fun->matchAttrs) {
         state.mkAttrs(v, 0);
         return;
@@ -2038,16 +2029,16 @@ void prim_match(EvalState & state, const Pos & pos, Value * * args, Value & v)
         if (e.code() == std::regex_constants::error_space) {
             // limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
             throw EvalError(
-                ErrorInfo { 
-                    .hint = hintfmt("memory limit exceeded by regular expression '%s'", re), 
+                ErrorInfo {
+                    .hint = hintfmt("memory limit exceeded by regular expression '%s'", re),
                     .nixCode = NixCode { .errPos = pos }
                 });
         } else {
-          throw EvalError(
-              ErrorInfo { 
-                  .hint = hintfmt("invalid regular expression '%s'", re), 
-                  .nixCode = NixCode { .errPos = pos }
-              });
+            throw EvalError(
+                ErrorInfo {
+                    .hint = hintfmt("invalid regular expression '%s'", re),
+                    .nixCode = NixCode { .errPos = pos }
+                });
         }
     }
 }
@@ -2111,19 +2102,19 @@ static void prim_split(EvalState & state, const Pos & pos, Value * * args, Value
 
     } catch (std::regex_error &e) {
         if (e.code() == std::regex_constants::error_space) {
-          // limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
-          throw EvalError(
-              ErrorInfo { 
-                  .hint = hintfmt("memory limit exceeded by regular expression '%s'", re), 
-                  .nixCode = NixCode { .errPos = pos }
-              });
-         } else {
-          throw EvalError(
-              ErrorInfo { 
-                  .hint = hintfmt("invalid regular expression '%s'", re), 
-                  .nixCode = NixCode { .errPos = pos }
-              });
-         }
+            // limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
+            throw EvalError(
+                ErrorInfo {
+                    .hint = hintfmt("memory limit exceeded by regular expression '%s'", re),
+                    .nixCode = NixCode { .errPos = pos }
+                });
+        } else {
+            throw EvalError(
+                ErrorInfo {
+                    .hint = hintfmt("invalid regular expression '%s'", re),
+                    .nixCode = NixCode { .errPos = pos }
+                });
+        }
     }
 }
 
diff --git a/src/libexpr/primops/context.cc b/src/libexpr/primops/context.cc
index 768936453..7f895fc01 100644
--- a/src/libexpr/primops/context.cc
+++ b/src/libexpr/primops/context.cc
@@ -151,7 +151,6 @@ static void prim_appendContext(EvalState & state, const Pos & pos, Value * * arg
                     .hint = hintfmt("Context key '%s' is not a store path", i.name),
                     .nixCode = NixCode { .errPos = *i.pos }
                 });
-
         if (!settings.readOnlyMode)
             state.store->ensurePath(state.store->parseStorePath(i.name));
         state.forceAttrs(*i.value, *i.pos);
@@ -170,7 +169,6 @@ static void prim_appendContext(EvalState & state, const Pos & pos, Value * * arg
                             .hint = hintfmt("Tried to add all-outputs context of %s, which is not a derivation, to a string", i.name),
                             .nixCode = NixCode { .errPos = *i.pos }
                         });
-
                 }
                 context.insert("=" + string(i.name));
             }
diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc
index 1e8b9d4a0..bb008ba6b 100644
--- a/src/libexpr/primops/fetchMercurial.cc
+++ b/src/libexpr/primops/fetchMercurial.cc
@@ -43,7 +43,6 @@ static void prim_fetchMercurial(EvalState & state, const Pos & pos, Value * * ar
                         .hint = hintfmt("unsupported argument '%s' to 'fetchMercurial'", attr.name),
                         .nixCode = NixCode { .errPos = *attr.pos }
                     });
-
         }
 
         if (url.empty())
-- 
cgit v1.2.3


From 4daccb279c547b90b0c17c8a64825f04abdf0f7e Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Thu, 14 May 2020 10:28:17 -0600
Subject: formatting

---
 src/libexpr/primops.cc | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index d21c49813..9b9cbfc2e 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -767,7 +767,6 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
                 .nixCode = NixCode { .errPos = posDrvName }
             });
 
-
     /* Check whether the derivation name is valid. */
     if (isDerivation(drvName))
         throw EvalError(
@@ -776,7 +775,6 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
                 .nixCode = NixCode { .errPos = posDrvName }
             });
 
-
     if (outputHash) {
         /* Handle fixed-output derivations. */
         if (outputs.size() != 1 || *(outputs.begin()) != "out")
-- 
cgit v1.2.3


From 6ee03b8444e1838b9985a9fd4f0f46947e958b3b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 3 Jun 2020 12:38:23 +0200
Subject: libutils/hash: remove default encoding

This will make it easier to reason about the hash encoding and switch to
SRI everywhere where possible.
---
 src/libexpr/primops/fetchTree.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc
index c5a0d9886..b90408798 100644
--- a/src/libexpr/primops/fetchTree.cc
+++ b/src/libexpr/primops/fetchTree.cc
@@ -23,7 +23,7 @@ void emitTreeAttrs(
 
     assert(tree.info.narHash);
     mkString(*state.allocAttr(v, state.symbols.create("narHash")),
-        tree.info.narHash.to_string(SRI));
+        tree.info.narHash.to_string(SRI, true));
 
     if (input->getRev()) {
         mkString(*state.allocAttr(v, state.symbols.create("rev")), input->getRev()->gitRev());
@@ -140,7 +140,7 @@ static void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
             : hashFile(htSHA256, path);
         if (hash != *expectedHash)
             throw Error((unsigned int) 102, "hash mismatch in file downloaded from '%s':\n  wanted: %s\n  got:    %s",
-                *url, expectedHash->to_string(), hash.to_string());
+                *url, expectedHash->to_string(Base32, true), hash.to_string(Base32, true));
     }
 
     if (state.allowedPaths)
-- 
cgit v1.2.3


From 801112de1af8e519e29e1e1c678f97de45a8c49d Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 8 Jun 2020 17:16:52 +0200
Subject: Move progress-bar.cc to libmain

Needed so that we can include it as a logger in loggers.cc without
adding a dependency on nix

This also requires moving names.hh to libutil to prevent a circular
dependency between libmain and libexpr
---
 src/libexpr/names.cc | 107 ---------------------------------------------------
 src/libexpr/names.hh |  32 ---------------
 2 files changed, 139 deletions(-)
 delete mode 100644 src/libexpr/names.cc
 delete mode 100644 src/libexpr/names.hh

(limited to 'src/libexpr')

diff --git a/src/libexpr/names.cc b/src/libexpr/names.cc
deleted file mode 100644
index d1c8a6101..000000000
--- a/src/libexpr/names.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "names.hh"
-#include "util.hh"
-
-
-namespace nix {
-
-
-DrvName::DrvName()
-{
-    name = "";
-}
-
-
-/* Parse a derivation name.  The `name' part of a derivation name is
-   everything up to but not including the first dash *not* followed by
-   a letter.  The `version' part is the rest (excluding the separating
-   dash).  E.g., `apache-httpd-2.0.48' is parsed to (`apache-httpd',
-   '2.0.48'). */
-DrvName::DrvName(std::string_view s) : hits(0)
-{
-    name = fullName = std::string(s);
-    for (unsigned int i = 0; i < s.size(); ++i) {
-        /* !!! isalpha/isdigit are affected by the locale. */
-        if (s[i] == '-' && i + 1 < s.size() && !isalpha(s[i + 1])) {
-            name = s.substr(0, i);
-            version = s.substr(i + 1);
-            break;
-        }
-    }
-}
-
-
-bool DrvName::matches(DrvName & n)
-{
-    if (name != "*") {
-        if (!regex) regex = std::unique_ptr<std::regex>(new std::regex(name, std::regex::extended));
-        if (!std::regex_match(n.name, *regex)) return false;
-    }
-    if (version != "" && version != n.version) return false;
-    return true;
-}
-
-
-string nextComponent(string::const_iterator & p,
-    const string::const_iterator end)
-{
-    /* Skip any dots and dashes (component separators). */
-    while (p != end && (*p == '.' || *p == '-')) ++p;
-
-    if (p == end) return "";
-
-    /* If the first character is a digit, consume the longest sequence
-       of digits.  Otherwise, consume the longest sequence of
-       non-digit, non-separator characters. */
-    string s;
-    if (isdigit(*p))
-        while (p != end && isdigit(*p)) s += *p++;
-    else
-        while (p != end && (!isdigit(*p) && *p != '.' && *p != '-'))
-            s += *p++;
-
-    return s;
-}
-
-
-static bool componentsLT(const string & c1, const string & c2)
-{
-    int n1, n2;
-    bool c1Num = string2Int(c1, n1), c2Num = string2Int(c2, n2);
-
-    if (c1Num && c2Num) return n1 < n2;
-    else if (c1 == "" && c2Num) return true;
-    else if (c1 == "pre" && c2 != "pre") return true;
-    else if (c2 == "pre") return false;
-    /* Assume that `2.3a' < `2.3.1'. */
-    else if (c2Num) return true;
-    else if (c1Num) return false;
-    else return c1 < c2;
-}
-
-
-int compareVersions(const string & v1, const string & v2)
-{
-    string::const_iterator p1 = v1.begin();
-    string::const_iterator p2 = v2.begin();
-
-    while (p1 != v1.end() || p2 != v2.end()) {
-        string c1 = nextComponent(p1, v1.end());
-        string c2 = nextComponent(p2, v2.end());
-        if (componentsLT(c1, c2)) return -1;
-        else if (componentsLT(c2, c1)) return 1;
-    }
-
-    return 0;
-}
-
-
-DrvNames drvNamesFromArgs(const Strings & opArgs)
-{
-    DrvNames result;
-    for (auto & i : opArgs)
-        result.push_back(DrvName(i));
-    return result;
-}
-
-
-}
diff --git a/src/libexpr/names.hh b/src/libexpr/names.hh
deleted file mode 100644
index 00e14b8c7..000000000
--- a/src/libexpr/names.hh
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <memory>
-
-#include "types.hh"
-#include <regex>
-
-namespace nix {
-
-struct DrvName
-{
-    string fullName;
-    string name;
-    string version;
-    unsigned int hits;
-
-    DrvName();
-    DrvName(std::string_view s);
-    bool matches(DrvName & n);
-
-private:
-    std::unique_ptr<std::regex> regex;
-};
-
-typedef list<DrvName> DrvNames;
-
-string nextComponent(string::const_iterator & p,
-    const string::const_iterator end);
-int compareVersions(const string & v1, const string & v2);
-DrvNames drvNamesFromArgs(const Strings & opArgs);
-
-}
-- 
cgit v1.2.3


From 762273f1fd48b2b2f2bbedca65abfd4c07b5af05 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 9 Jun 2020 01:23:37 -0500
Subject: Allow empty hash in derivations

follow up of https://github.com/NixOS/nix/pull/3544

This allows hash="" so that it can be used for debugging purposes. For
instance, this gives you an error message like:

  warning: found empty hash, assuming you wanted 'sha256:0000000000000000000000000000000000000000000000000000'
  hash mismatch in fixed-output derivation '/nix/store/asx6qw1r1xk6iak6y6jph4n58h4hdmbm-nix':
    wanted: sha256:0000000000000000000000000000000000000000000000000000
    got:    sha256:0fpfhipl9v1mfzw2ffmxiyyzqwlkvww22bh9wcy4qrfslb4jm429
---
 src/libexpr/primops.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index d458ab272..de04fd2be 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -719,7 +719,13 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
             throw Error(format("multiple outputs are not supported in fixed-output derivations, at %1%") % posDrvName);
 
         HashType ht = outputHashAlgo.empty() ? htUnknown : parseHashType(outputHashAlgo);
-        Hash h(*outputHash, ht);
+
+        Hash h;
+        if (outputHash->empty()) {
+            h = Hash(ht);
+            printError("warning: found empty hash, assuming you wanted '%s'", h.to_string());
+        } else
+            h = Hash(*outputHash, ht);
 
         auto outPath = state.store->makeFixedOutputPath(ingestionMethod, h, drvName);
         if (!jsonObject) drv.env["out"] = state.store->printStorePath(outPath);
-- 
cgit v1.2.3


From 19aa892f2064d437d32a3c12758d6a623b7ae8e5 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 9 Jun 2020 11:10:54 -0500
Subject: Support empty hash in fetchers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fetchTarball, fetchTree, and fetchGit all have *optional* hash attrs.
This means that we need to be careful with what we allow to avoid
accidentally making these defaults. When ‘hash = ""’ we assume the
empty hash is wanted.
---
 src/libexpr/primops.cc           | 11 ++++++++---
 src/libexpr/primops/fetchTree.cc | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index de04fd2be..df3d4a459 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -1131,9 +1131,14 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
             filterFun = attr.value;
         } else if (n == "recursive")
             method = FileIngestionMethod { state.forceBool(*attr.value, *attr.pos) };
-        else if (n == "sha256")
-            expectedHash = Hash(state.forceStringNoCtx(*attr.value, *attr.pos), htSHA256);
-        else
+        else if (n == "sha256") {
+            auto hashStr = state.forceStringNoCtx(*attr.value, *attr.pos);
+            if (hashStr == "") {
+                expectedHash = Hash(htSHA256);
+                printError("warning: found empty hash, assuming you wanted '%s'", expectedHash.to_string());
+            } else
+                expectedHash = Hash(hashStr, htSHA256);
+        } else
             throw EvalError(format("unsupported argument '%1%' to 'addPath', at %2%") % attr.name % *attr.pos);
     }
     if (path.empty())
diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc
index c5a0d9886..745f65adf 100644
--- a/src/libexpr/primops/fetchTree.cc
+++ b/src/libexpr/primops/fetchTree.cc
@@ -102,9 +102,14 @@ static void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
             string n(attr.name);
             if (n == "url")
                 url = state.forceStringNoCtx(*attr.value, *attr.pos);
-            else if (n == "sha256")
-                expectedHash = Hash(state.forceStringNoCtx(*attr.value, *attr.pos), htSHA256);
-            else if (n == "name")
+            else if (n == "sha256") {
+                auto hashStr = state.forceStringNoCtx(*attr.value, *attr.pos);
+                if (hashStr == "") {
+                    expectedHash = Hash(htSHA256);
+                    printError("warning: found empty hash, assuming you wanted '%s'", expectedHash->to_string());
+                } else
+                    expectedHash = Hash(hashStr, htSHA256);
+            } else if (n == "name")
                 name = state.forceStringNoCtx(*attr.value, *attr.pos);
             else
                 throw EvalError("unsupported argument '%s' to '%s', at %s",
-- 
cgit v1.2.3


From 045b07200c77bf1fe19c0a986aafb531e7e1ba54 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 12 Jun 2020 12:46:33 +0200
Subject: Remove Store::queryDerivationOutputNames()

This function was used in only one place, where it could easily be
replaced by readDerivation() since it's not
performance-critical. (This function appears to have been modelled
after queryDerivationOutputs(), which exists only to make the garbage
collector faster.)
---
 src/libexpr/primops.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index d458ab272..9efb8eae5 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -688,7 +688,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
             for (auto & j : refs) {
                 drv.inputSrcs.insert(j.clone());
                 if (j.isDerivation())
-                    drv.inputDrvs[j.clone()] = state.store->queryDerivationOutputNames(j);
+                    drv.inputDrvs[j.clone()] = readDerivation(*state.store, state.store->toRealPath(j)).outputNames();
             }
         }
 
-- 
cgit v1.2.3


From 9f736dd89d064718a378703a9557de56fdd1a734 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 12 Jun 2020 13:04:52 +0200
Subject: Add Store::readDerivation() convenience function

---
 src/libexpr/primops.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 9efb8eae5..3a27527a0 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -688,7 +688,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
             for (auto & j : refs) {
                 drv.inputSrcs.insert(j.clone());
                 if (j.isDerivation())
-                    drv.inputDrvs[j.clone()] = readDerivation(*state.store, state.store->toRealPath(j)).outputNames();
+                    drv.inputDrvs[j.clone()] = state.store->readDerivation(j).outputNames();
             }
         }
 
-- 
cgit v1.2.3


From b260c9ee0325d7a4c78d91e47bd6e2afbde16e28 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 12 Jun 2020 10:09:42 -0500
Subject: Add newHashAllowEmpty helper function

This replaces the copy&paste with a helper function in hash.hh.
---
 src/libexpr/primops.cc           | 18 ++++--------------
 src/libexpr/primops/fetchTree.cc | 11 +++--------
 2 files changed, 7 insertions(+), 22 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index df3d4a459..083c7d398 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -720,12 +720,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
 
         HashType ht = outputHashAlgo.empty() ? htUnknown : parseHashType(outputHashAlgo);
 
-        Hash h;
-        if (outputHash->empty()) {
-            h = Hash(ht);
-            printError("warning: found empty hash, assuming you wanted '%s'", h.to_string());
-        } else
-            h = Hash(*outputHash, ht);
+        Hash h = newHashAllowEmpty(*outputHash, ht);
 
         auto outPath = state.store->makeFixedOutputPath(ingestionMethod, h, drvName);
         if (!jsonObject) drv.env["out"] = state.store->printStorePath(outPath);
@@ -1131,14 +1126,9 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
             filterFun = attr.value;
         } else if (n == "recursive")
             method = FileIngestionMethod { state.forceBool(*attr.value, *attr.pos) };
-        else if (n == "sha256") {
-            auto hashStr = state.forceStringNoCtx(*attr.value, *attr.pos);
-            if (hashStr == "") {
-                expectedHash = Hash(htSHA256);
-                printError("warning: found empty hash, assuming you wanted '%s'", expectedHash.to_string());
-            } else
-                expectedHash = Hash(hashStr, htSHA256);
-        } else
+        else if (n == "sha256")
+            expectedHash = newHashAllowEmpty(state.forceStringNoCtx(*attr.value, *attr.pos), htSHA256);
+        else
             throw EvalError(format("unsupported argument '%1%' to 'addPath', at %2%") % attr.name % *attr.pos);
     }
     if (path.empty())
diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc
index 745f65adf..1464aa8b4 100644
--- a/src/libexpr/primops/fetchTree.cc
+++ b/src/libexpr/primops/fetchTree.cc
@@ -102,14 +102,9 @@ static void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
             string n(attr.name);
             if (n == "url")
                 url = state.forceStringNoCtx(*attr.value, *attr.pos);
-            else if (n == "sha256") {
-                auto hashStr = state.forceStringNoCtx(*attr.value, *attr.pos);
-                if (hashStr == "") {
-                    expectedHash = Hash(htSHA256);
-                    printError("warning: found empty hash, assuming you wanted '%s'", expectedHash->to_string());
-                } else
-                    expectedHash = Hash(hashStr, htSHA256);
-            } else if (n == "name")
+            else if (n == "sha256")
+                expectedHash = newHashAllowEmpty(state.forceStringNoCtx(*attr.value, *attr.pos), htSHA256);
+            else if (n == "name")
                 name = state.forceStringNoCtx(*attr.value, *attr.pos);
             else
                 throw EvalError("unsupported argument '%s' to '%s', at %s",
-- 
cgit v1.2.3


From fd64e4fb96f814440dc337ce664cdbd22e0eabb2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 15 Jun 2020 13:50:33 +0200
Subject: Disambiguate BaseError(Args) constructor

This means that 'throw Error({ ... ErrorInfo ... })' now works.
---
 src/libexpr/eval.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 7bf25ea17..75e6a23a1 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -506,11 +506,10 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2))
 
 LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const string & s2))
 {
-    throw EvalError(
-        ErrorInfo { 
-            .hint = hintfmt(s, s2),
-            .nixCode = NixCode { .errPos = pos }
-        });
+    throw EvalError({
+        .hint = hintfmt(s, s2),
+        .nixCode = NixCode { .errPos = pos }
+    });
 }
 
 LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const string & s3))
-- 
cgit v1.2.3


From 1fb762d11fadc659ef41b79eaddddcce5fbbc192 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 15 Jun 2020 14:06:58 +0200
Subject: Get rid of explicit ErrorInfo constructors

---
 src/libexpr/attr-set.hh               |   9 +-
 src/libexpr/eval-inline.hh            |  18 +-
 src/libexpr/eval.cc                   |  65 +++--
 src/libexpr/nixexpr.cc                |   9 +-
 src/libexpr/nixexpr.hh                |   9 +-
 src/libexpr/parser.y                  |  86 +++----
 src/libexpr/primops.cc                | 442 +++++++++++++++-------------------
 src/libexpr/primops/context.cc        |  27 +--
 src/libexpr/primops/fetchGit.cc       |  18 +-
 src/libexpr/primops/fetchMercurial.cc |  18 +-
 src/libexpr/primops/fetchTree.cc      |  28 +--
 src/libexpr/primops/fromTOML.cc       |   9 +-
 12 files changed, 326 insertions(+), 412 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/attr-set.hh b/src/libexpr/attr-set.hh
index f5651891f..c601d09c2 100644
--- a/src/libexpr/attr-set.hh
+++ b/src/libexpr/attr-set.hh
@@ -76,11 +76,10 @@ public:
     {
         auto a = get(name);
         if (!a)
-            throw Error(
-                ErrorInfo { 
-                    .hint = hintfmt("attribute '%s' missing", name),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw Error({
+                .hint = hintfmt("attribute '%s' missing", name),
+                .nixCode = NixCode { .errPos = pos }
+            });
 
         return *a;
     }
diff --git a/src/libexpr/eval-inline.hh b/src/libexpr/eval-inline.hh
index eee49e02e..3d544c903 100644
--- a/src/libexpr/eval-inline.hh
+++ b/src/libexpr/eval-inline.hh
@@ -9,11 +9,10 @@ namespace nix {
 
 LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s))
 {
-    throw EvalError(
-        ErrorInfo { 
-            .hint = hintfmt(s),
-            .nixCode = NixCode { .errPos = pos }
-        });
+    throw EvalError({
+        .hint = hintfmt(s),
+        .nixCode = NixCode { .errPos = pos }
+    });
 }
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v))
@@ -24,11 +23,10 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v))
 
 LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const Value & v))
 {
-    throw TypeError(
-        ErrorInfo { 
-            .hint = hintfmt(s, showType(v)),
-            .nixCode = NixCode { .errPos = pos }
-        });
+    throw TypeError({
+        .hint = hintfmt(s, showType(v)),
+        .nixCode = NixCode { .errPos = pos }
+    });
 }
 
 
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 75e6a23a1..8e71db2b8 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -519,30 +519,27 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, con
 
 LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const string & s2, const string & s3))
 {
-    throw EvalError(
-        ErrorInfo { 
-            .hint = hintfmt(s, s2, s3),
-            .nixCode = NixCode { .errPos = pos }
-        });
+    throw EvalError({
+        .hint = hintfmt(s, s2, s3),
+        .nixCode = NixCode { .errPos = pos }
+    });
 }
 
 LocalNoInlineNoReturn(void throwEvalError(const Pos & p1, const char * s, const Symbol & sym, const Pos & p2))
 {
     // p1 is where the error occurred; p2 is a position mentioned in the message.
-    throw EvalError(
-        ErrorInfo { 
-            .hint = hintfmt(s, sym, p2),
-            .nixCode = NixCode { .errPos = p1 }
-        });
+    throw EvalError({
+        .hint = hintfmt(s, sym, p2),
+        .nixCode = NixCode { .errPos = p1 }
+    });
 }
 
 LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s))
 {
-    throw TypeError(
-        ErrorInfo { 
-            .hint = hintfmt(s),
-            .nixCode = NixCode { .errPos = pos }
-        });
+    throw TypeError({
+        .hint = hintfmt(s),
+        .nixCode = NixCode { .errPos = pos }
+    });
 }
 
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1))
@@ -552,29 +549,26 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1))
 
 LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const ExprLambda & fun, const Symbol & s2))
 {
-    throw TypeError(
-        ErrorInfo { 
-            .hint = hintfmt(s, fun.showNamePos(), s2),
-            .nixCode = NixCode { .errPos = pos }
-        });
+    throw TypeError({
+        .hint = hintfmt(s, fun.showNamePos(), s2),
+        .nixCode = NixCode { .errPos = pos }
+    });
 }
 
 LocalNoInlineNoReturn(void throwAssertionError(const Pos & pos, const char * s, const string & s1))
 {
-    throw AssertionError(
-        ErrorInfo { 
-            .hint = hintfmt(s, s1),
-            .nixCode = NixCode { .errPos = pos }
-        });
+    throw AssertionError({
+        .hint = hintfmt(s, s1),
+        .nixCode = NixCode { .errPos = pos }
+    });
 }
 
 LocalNoInlineNoReturn(void throwUndefinedVarError(const Pos & pos, const char * s, const string & s1))
 {
-    throw UndefinedVarError(
-        ErrorInfo { 
-            .hint = hintfmt(s, s1),
-            .nixCode = NixCode { .errPos = pos }
-        });
+    throw UndefinedVarError({
+        .hint = hintfmt(s, s1),
+        .nixCode = NixCode { .errPos = pos }
+    });
 }
 
 LocalNoInline(void addErrorPrefix(Error & e, const char * s, const string & s2))
@@ -1593,7 +1587,7 @@ string EvalState::forceStringNoCtx(Value & v, const Pos & pos)
     string s = forceString(v, pos);
     if (v.string.context) {
         if (pos)
-            throwEvalError(pos, "the string '%1%' is not allowed to refer to a store path (such as '%2%')", 
+            throwEvalError(pos, "the string '%1%' is not allowed to refer to a store path (such as '%2%')",
                 v.string.s, v.string.context[0]);
         else
             throwEvalError("the string '%1%' is not allowed to refer to a store path (such as '%2%')",
@@ -1919,11 +1913,10 @@ void EvalState::printStats()
 
 string ExternalValueBase::coerceToString(const Pos & pos, PathSet & context, bool copyMore, bool copyToStore) const
 {
-    throw TypeError(
-        ErrorInfo { 
-            .hint = hintfmt("cannot coerce %1% to a string", showType()),
-            .nixCode = NixCode { .errPos = pos }
-        });
+    throw TypeError({
+        .hint = hintfmt("cannot coerce %1% to a string", showType()),
+        .nixCode = NixCode { .errPos = pos }
+    });
 }
 
 
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index 91a508305..5b2dd9751 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -268,11 +268,10 @@ void ExprVar::bindVars(const StaticEnv & env)
        enclosing `with'.  If there is no `with', then we can issue an
        "undefined variable" error now. */
     if (withLevel == -1) 
-        throw UndefinedVarError(
-            ErrorInfo {
-                .hint = hintfmt("undefined variable '%1%'", name),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw UndefinedVarError({
+            .hint = hintfmt("undefined variable '%1%'", name),
+            .nixCode = NixCode { .errPos = pos }
+        });
     fromWith = true;
     this->level = withLevel;
 }
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index 47d0e85ec..ec6fd3190 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -236,11 +236,10 @@ struct ExprLambda : Expr
         : pos(pos), arg(arg), matchAttrs(matchAttrs), formals(formals), body(body)
     {
         if (!arg.empty() && formals && formals->argNames.find(arg) != formals->argNames.end())
-            throw ParseError(
-                ErrorInfo {
-                    .hint = hintfmt("duplicate formal function argument '%1%'", arg),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw ParseError({
+                .hint = hintfmt("duplicate formal function argument '%1%'", arg),
+                .nixCode = NixCode { .errPos = pos }
+            });
     };
     void setName(Symbol & name);
     string showNamePos() const;
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 0417a3c21..a1188dec0 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -64,23 +64,20 @@ namespace nix {
 
 static void dupAttr(const AttrPath & attrPath, const Pos & pos, const Pos & prevPos)
 {
-    throw ParseError(
-        ErrorInfo {
-            .hint = hintfmt("attribute '%1%' already defined at %2%",
-                showAttrPath(attrPath), prevPos),
-            .nixCode = NixCode { .errPos = pos },
-        });
+    throw ParseError({
+        .hint = hintfmt("attribute '%1%' already defined at %2%",
+            showAttrPath(attrPath), prevPos),
+        .nixCode = NixCode { .errPos = pos },
+    });
 }
 
 
 static void dupAttr(Symbol attr, const Pos & pos, const Pos & prevPos)
 {
-    throw ParseError(
-        ErrorInfo {
-            .hint = hintfmt("attribute '%1%' already defined at %2%",
-                attr, prevPos),
-            .nixCode = NixCode { .errPos = pos },
-        });
+    throw ParseError({
+        .hint = hintfmt("attribute '%1%' already defined at %2%", attr, prevPos),
+        .nixCode = NixCode { .errPos = pos },
+    });
 }
 
 
@@ -148,12 +145,11 @@ static void addAttr(ExprAttrs * attrs, AttrPath & attrPath,
 static void addFormal(const Pos & pos, Formals * formals, const Formal & formal)
 {
     if (!formals->argNames.insert(formal.name).second)
-        throw ParseError(
-            ErrorInfo {
-                .hint = hintfmt("duplicate formal function argument '%1%'",
-                    formal.name),
-                .nixCode = NixCode { .errPos = pos },
-            });
+        throw ParseError({
+            .hint = hintfmt("duplicate formal function argument '%1%'",
+                formal.name),
+            .nixCode = NixCode { .errPos = pos },
+        });
     formals->formals.push_front(formal);
 }
 
@@ -261,10 +257,10 @@ static inline Pos makeCurPos(const YYLTYPE & loc, ParseData * data)
 
 void yyerror(YYLTYPE * loc, yyscan_t scanner, ParseData * data, const char * error)
 {
-    data->error = ErrorInfo { 
+    data->error = {
         .hint = hintfmt(error),
         .nixCode = NixCode { .errPos = makeCurPos(*loc, data) }
-        };
+    };
 }
 
 
@@ -341,11 +337,10 @@ expr_function
     { $$ = new ExprWith(CUR_POS, $2, $4); }
   | LET binds IN expr_function
     { if (!$2->dynamicAttrs.empty())
-        throw ParseError(
-            ErrorInfo {
-                .hint = hintfmt("dynamic attributes not allowed in let"),
-                .nixCode = NixCode { .errPos = CUR_POS },
-            });
+        throw ParseError({
+            .hint = hintfmt("dynamic attributes not allowed in let"),
+            .nixCode = NixCode { .errPos = CUR_POS },
+        });
       $$ = new ExprLet($2, $4);
     }
   | expr_if
@@ -422,11 +417,10 @@ expr_simple
   | URI {
       static bool noURLLiterals = settings.isExperimentalFeatureEnabled("no-url-literals");
       if (noURLLiterals)
-          throw ParseError(
-              ErrorInfo { 
-                  .hint = hintfmt("URL literals are disabled"),
-                  .nixCode = NixCode { .errPos = CUR_POS }
-              });
+          throw ParseError({
+              .hint = hintfmt("URL literals are disabled"),
+              .nixCode = NixCode { .errPos = CUR_POS }
+          });
       $$ = new ExprString(data->symbols.create($1));
   }
   | '(' expr ')' { $$ = $2; }
@@ -496,11 +490,10 @@ attrs
           $$->push_back(AttrName(str->s));
           delete str;
       } else
-          throw ParseError(
-              ErrorInfo {
-                  .hint = hintfmt("dynamic attributes not allowed in inherit"),
-                  .nixCode = NixCode { .errPos = makeCurPos(@2, data) },
-              });
+          throw ParseError({
+              .hint = hintfmt("dynamic attributes not allowed in inherit"),
+              .nixCode = NixCode { .errPos = makeCurPos(@2, data) },
+          });
     }
   | { $$ = new AttrPath; }
   ;
@@ -695,11 +688,10 @@ Path EvalState::findFile(SearchPath & searchPath, const string & path, const Pos
         Path res = r.second + suffix;
         if (pathExists(res)) return canonPath(res);
     }
-    throw ThrownError(
-        ErrorInfo { 
-            .hint = hintfmt("file '%1%' was not found in the Nix search path (add it using $NIX_PATH or -I)", path),
-            .nixCode = NixCode { .errPos = pos }
-        });
+    throw ThrownError({
+        .hint = hintfmt("file '%1%' was not found in the Nix search path (add it using $NIX_PATH or -I)", path),
+        .nixCode = NixCode { .errPos = pos }
+    });
 }
 
 
@@ -715,10 +707,9 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
             res = { true, store->toRealPath(fetchers::downloadTarball(
                         store, resolveUri(elem.second), "source", false).storePath) };
         } catch (FileTransferError & e) {
-            logWarning(
-                ErrorInfo { 
-                    .name = "Entry download",
-                    .hint = hintfmt("Nix search path entry '%1%' cannot be downloaded, ignoring", elem.second)
+            logWarning({
+                .name = "Entry download",
+                .hint = hintfmt("Nix search path entry '%1%' cannot be downloaded, ignoring", elem.second)
             });
             res = { false, "" };
         }
@@ -727,10 +718,9 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
         if (pathExists(path))
             res = { true, path };
         else {
-            logWarning(
-                ErrorInfo { 
-                    .name = "Entry not found",
-                    .hint = hintfmt("warning: Nix search path entry '%1%' does not exist, ignoring", elem.second)
+            logWarning({
+                .name = "Entry not found",
+                .hint = hintfmt("warning: Nix search path entry '%1%' does not exist, ignoring", elem.second)
             });
             res = { false, "" };
         }
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 23ab7dec6..62e5163c9 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -93,12 +93,10 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("cannot import '%1%', since path '%2%' is not valid",
-                        path, e.path),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("cannot import '%1%', since path '%2%' is not valid", path, e.path),
+            .nixCode = NixCode { .errPos = pos }
+        });
     }
 
     Path realPath = state.checkSourcePath(state.toRealPath(path, context));
@@ -174,13 +172,12 @@ void prim_importNative(EvalState & state, const Pos & pos, Value * * args, Value
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt(
-                    "cannot import '%1%', since path '%2%' is not valid",
-                    path, e.path),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt(
+                "cannot import '%1%', since path '%2%' is not valid",
+                path, e.path),
+            .nixCode = NixCode { .errPos = pos }
+        });
     }
 
     path = state.checkSourcePath(path);
@@ -215,11 +212,10 @@ void prim_exec(EvalState & state, const Pos & pos, Value * * args, Value & v)
     auto elems = args[0]->listElems();
     auto count = args[0]->listSize();
     if (count == 0) {
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt("at least one argument to 'exec' required"),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("at least one argument to 'exec' required"),
+            .nixCode = NixCode { .errPos = pos }
+        });
     }
     PathSet context;
     auto program = state.coerceToString(pos, *elems[0], context, false, false);
@@ -230,12 +226,12 @@ void prim_exec(EvalState & state, const Pos & pos, Value * * args, Value & v)
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt("cannot execute '%1%', since path '%2%' is not valid",
-                    program, e.path),
-                .nixCode = NixCode { .errPos = pos }
-            });}
+        throw EvalError({
+            .hint = hintfmt("cannot execute '%1%', since path '%2%' is not valid",
+                program, e.path),
+            .nixCode = NixCode { .errPos = pos }
+        });
+    }
 
     auto output = runProgram(program, true, commandArgs);
     Expr * parsed;
@@ -386,11 +382,10 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
     Bindings::iterator startSet =
         args[0]->attrs->find(state.symbols.create("startSet"));
     if (startSet == args[0]->attrs->end())
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt("attribute 'startSet' required"),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("attribute 'startSet' required"),
+            .nixCode = NixCode { .errPos = pos }
+        });
     state.forceList(*startSet->value, pos);
 
     ValueList workSet;
@@ -401,11 +396,10 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
     Bindings::iterator op =
         args[0]->attrs->find(state.symbols.create("operator"));
     if (op == args[0]->attrs->end())
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt("attribute 'operator' required"),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("attribute 'operator' required"),
+            .nixCode = NixCode { .errPos = pos }
+        });
     state.forceValue(*op->value, pos);
 
     /* Construct the closure by applying the operator to element of
@@ -424,11 +418,10 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
         Bindings::iterator key =
             e->attrs->find(state.symbols.create("key"));
         if (key == e->attrs->end())
-            throw EvalError(
-                ErrorInfo {
-                    .hint = hintfmt("attribute 'key' required"),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("attribute 'key' required"),
+                .nixCode = NixCode { .errPos = pos }
+            });
         state.forceValue(*key->value, pos);
 
         if (!doneKeys.insert(key->value).second) continue;
@@ -560,11 +553,10 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
     /* Figure out the name first (for stack backtraces). */
     Bindings::iterator attr = args[0]->attrs->find(state.sName);
     if (attr == args[0]->attrs->end())
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt("required attribute 'name' missing"),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("required attribute 'name' missing"),
+            .nixCode = NixCode { .errPos = pos }
+        });
     string drvName;
     Pos & posDrvName(*attr->pos);
     try {
@@ -607,42 +599,38 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
         auto handleHashMode = [&](const std::string & s) {
             if (s == "recursive") ingestionMethod = FileIngestionMethod::Recursive;
             else if (s == "flat") ingestionMethod = FileIngestionMethod::Flat;
-            else 
-                throw EvalError(
-                    ErrorInfo { 
-                        .hint = hintfmt("invalid value '%s' for 'outputHashMode' attribute", s),
-                        .nixCode = NixCode { .errPos = posDrvName }
-                    });
+            else
+                throw EvalError({
+                    .hint = hintfmt("invalid value '%s' for 'outputHashMode' attribute", s),
+                    .nixCode = NixCode { .errPos = posDrvName }
+                });
         };
 
         auto handleOutputs = [&](const Strings & ss) {
             outputs.clear();
             for (auto & j : ss) {
                 if (outputs.find(j) != outputs.end())
-                    throw EvalError(
-                        ErrorInfo { 
-                            .hint = hintfmt("duplicate derivation output '%1%'", j),
-                            .nixCode = NixCode { .errPos = posDrvName }
-                        });
+                    throw EvalError({
+                        .hint = hintfmt("duplicate derivation output '%1%'", j),
+                        .nixCode = NixCode { .errPos = posDrvName }
+                    });
                 /* !!! Check whether j is a valid attribute
                    name. */
                 /* Derivations cannot be named ‘drv’, because
                    then we'd have an attribute ‘drvPath’ in
                    the resulting set. */
                 if (j == "drv")
-                    throw EvalError(
-                        ErrorInfo { 
-                            .hint = hintfmt("invalid derivation output name 'drv'" ),
-                            .nixCode = NixCode { .errPos = posDrvName }
-                        });
+                    throw EvalError({
+                        .hint = hintfmt("invalid derivation output name 'drv'" ),
+                        .nixCode = NixCode { .errPos = posDrvName }
+                    });
                 outputs.insert(j);
             }
             if (outputs.empty())
-                throw EvalError(
-                    ErrorInfo { 
-                        .hint = hintfmt("derivation cannot have an empty set of outputs"),
-                        .nixCode = NixCode { .errPos = posDrvName }
-                    });
+                throw EvalError({
+                    .hint = hintfmt("derivation cannot have an empty set of outputs"),
+                    .nixCode = NixCode { .errPos = posDrvName }
+                });
         };
 
         try {
@@ -754,35 +742,31 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
 
     /* Do we have all required attributes? */
     if (drv.builder == "")
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("required attribute 'builder' missing"),
-                .nixCode = NixCode { .errPos = posDrvName }
-            });
+        throw EvalError({
+            .hint = hintfmt("required attribute 'builder' missing"),
+            .nixCode = NixCode { .errPos = posDrvName }
+        });
 
     if (drv.platform == "")
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("required attribute 'system' missing"),
-                .nixCode = NixCode { .errPos = posDrvName }
-            });
+        throw EvalError({
+            .hint = hintfmt("required attribute 'system' missing"),
+            .nixCode = NixCode { .errPos = posDrvName }
+        });
 
     /* Check whether the derivation name is valid. */
     if (isDerivation(drvName))
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("derivation names are not allowed to end in '%s'", drvExtension),
-                .nixCode = NixCode { .errPos = posDrvName }
-            });
+        throw EvalError({
+            .hint = hintfmt("derivation names are not allowed to end in '%s'", drvExtension),
+            .nixCode = NixCode { .errPos = posDrvName }
+        });
 
     if (outputHash) {
         /* Handle fixed-output derivations. */
         if (outputs.size() != 1 || *(outputs.begin()) != "out")
-            throw Error(
-                ErrorInfo { 
-                    .hint = hintfmt("multiple outputs are not supported in fixed-output derivations"),
-                    .nixCode = NixCode { .errPos = posDrvName }
-                });
+            throw Error({
+                .hint = hintfmt("multiple outputs are not supported in fixed-output derivations"),
+                .nixCode = NixCode { .errPos = posDrvName }
+            });
 
         HashType ht = outputHashAlgo.empty() ? htUnknown : parseHashType(outputHashAlgo);
 
@@ -887,11 +871,10 @@ static void prim_storePath(EvalState & state, const Pos & pos, Value * * args, V
        e.g. nix-push does the right thing. */
     if (!state.store->isStorePath(path)) path = canonPath(path, true);
     if (!state.store->isInStore(path))
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt("path '%1%' is not in the Nix store", path),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("path '%1%' is not in the Nix store", path),
+            .nixCode = NixCode { .errPos = pos }
+        });
     Path path2 = state.store->toStorePath(path);
     if (!settings.readOnlyMode)
         state.store->ensurePath(state.store->parseStorePath(path2));
@@ -907,13 +890,12 @@ static void prim_pathExists(EvalState & state, const Pos & pos, Value * * args,
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt(
-                    "cannot check the existence of '%1%', since path '%2%' is not valid", 
-                    path, e.path),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt(
+                "cannot check the existence of '%1%', since path '%2%' is not valid",
+                path, e.path),
+            .nixCode = NixCode { .errPos = pos }
+        });
     }
 
     try {
@@ -956,13 +938,11 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va
     try {
         state.realiseContext(context);
     } catch (InvalidPathError & e) {
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt("cannot read '%1%', since path '%2%' is not valid"
-                     , path, e.path),
-                .nixCode = NixCode { .errPos = pos }
-            });
- }
+        throw EvalError({
+            .hint = hintfmt("cannot read '%1%', since path '%2%' is not valid", path, e.path),
+            .nixCode = NixCode { .errPos = pos }
+        });
+    }
     string s = readFile(state.checkSourcePath(state.toRealPath(path, context)));
     if (s.find((char) 0) != string::npos)
         throw Error("the contents of the file '%1%' cannot be represented as a Nix string", path);
@@ -989,11 +969,10 @@ static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Va
 
         i = v2.attrs->find(state.symbols.create("path"));
         if (i == v2.attrs->end())
-            throw EvalError(
-                ErrorInfo {
-                    .hint = hintfmt("attribute 'path' missing"),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("attribute 'path' missing"),
+                .nixCode = NixCode { .errPos = pos }
+            });
 
         PathSet context;
         string path = state.coerceToString(pos, *i->value, context, false, false);
@@ -1001,12 +980,10 @@ static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Va
         try {
             state.realiseContext(context);
         } catch (InvalidPathError & e) {
-            throw EvalError(
-                ErrorInfo {
-                    .hint = hintfmt("cannot find '%1%', since path '%2%' is not valid",
-                        path, e.path),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("cannot find '%1%', since path '%2%' is not valid", path, e.path),
+                .nixCode = NixCode { .errPos = pos }
+            });
         }
 
         searchPath.emplace_back(prefix, path);
@@ -1023,11 +1000,10 @@ static void prim_hashFile(EvalState & state, const Pos & pos, Value * * args, Va
     string type = state.forceStringNoCtx(*args[0], pos);
     HashType ht = parseHashType(type);
     if (ht == htUnknown)
-      throw Error(
-          ErrorInfo {
-              .hint = hintfmt("unknown hash type '%1%'", type),
-              .nixCode = NixCode { .errPos = pos }
-          });
+      throw Error({
+          .hint = hintfmt("unknown hash type '%1%'", type),
+          .nixCode = NixCode { .errPos = pos }
+      });
 
     PathSet context; // discarded
     Path p = state.coerceToPath(pos, *args[1], context);
@@ -1043,12 +1019,10 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val
     try {
         state.realiseContext(ctx);
     } catch (InvalidPathError & e) {
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt("cannot read '%1%', since path '%2%' is not valid",
-                        path, e.path),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("cannot read '%1%', since path '%2%' is not valid", path, e.path),
+            .nixCode = NixCode { .errPos = pos }
+        });
     }
 
     DirEntries entries = readDirectory(state.checkSourcePath(path));
@@ -1118,15 +1092,13 @@ static void prim_toFile(EvalState & state, const Pos & pos, Value * * args, Valu
 
     for (auto path : context) {
         if (path.at(0) != '/')
-            throw EvalError(
-                ErrorInfo { 
-                    .hint = hintfmt(
-                        "in 'toFile': the file named '%1%' must not contain a reference "
-                        "to a derivation but contains (%2%)",
-                        name,
-                        path),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError( {
+                .hint = hintfmt(
+                    "in 'toFile': the file named '%1%' must not contain a reference "
+                    "to a derivation but contains (%2%)",
+                    name, path),
+                .nixCode = NixCode { .errPos = pos }
+            });
         refs.insert(state.store->parseStorePath(path));
     }
 
@@ -1194,21 +1166,19 @@ static void prim_filterSource(EvalState & state, const Pos & pos, Value * * args
     PathSet context;
     Path path = state.coerceToPath(pos, *args[1], context);
     if (!context.empty())
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("string '%1%' cannot refer to other paths", path),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("string '%1%' cannot refer to other paths", path),
+            .nixCode = NixCode { .errPos = pos }
+        });
 
     state.forceValue(*args[0], pos);
     if (args[0]->type != tLambda)
-        throw TypeError(
-            ErrorInfo { 
-                .hint = hintfmt(
-                    "first argument in call to 'filterSource' is not a function but %1%", 
-                    showType(*args[0])),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw TypeError({
+            .hint = hintfmt(
+                "first argument in call to 'filterSource' is not a function but %1%",
+                showType(*args[0])),
+            .nixCode = NixCode { .errPos = pos }
+        });
 
     addPath(state, pos, std::string(baseNameOf(path)), path, args[0], FileIngestionMethod::Recursive, Hash(), v);
 }
@@ -1228,12 +1198,10 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
             PathSet context;
             path = state.coerceToPath(*attr.pos, *attr.value, context);
             if (!context.empty())
-                throw EvalError(
-                    ErrorInfo { 
-                        .hint = hintfmt("string '%1%' cannot refer to other paths", 
-                            path),
-                        .nixCode = NixCode { .errPos = *attr.pos }
-                    });
+                throw EvalError({
+                    .hint = hintfmt("string '%1%' cannot refer to other paths", path),
+                    .nixCode = NixCode { .errPos = *attr.pos }
+                });
         } else if (attr.name == state.sName)
             name = state.forceStringNoCtx(*attr.value, *attr.pos);
         else if (n == "filter") {
@@ -1244,19 +1212,16 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
         else if (n == "sha256")
             expectedHash = newHashAllowEmpty(state.forceStringNoCtx(*attr.value, *attr.pos), htSHA256);
         else
-            throw EvalError(
-                ErrorInfo { 
-                    .hint = hintfmt("unsupported argument '%1%' to 'addPath'",
-                        attr.name),
-                    .nixCode = NixCode { .errPos = *attr.pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("unsupported argument '%1%' to 'addPath'", attr.name),
+                .nixCode = NixCode { .errPos = *attr.pos }
+            });
     }
     if (path.empty())
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("'path' required"),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("'path' required"),
+            .nixCode = NixCode { .errPos = pos }
+        });
     if (name.empty())
         name = baseNameOf(path);
 
@@ -1314,11 +1279,10 @@ void prim_getAttr(EvalState & state, const Pos & pos, Value * * args, Value & v)
     // !!! Should we create a symbol here or just do a lookup?
     Bindings::iterator i = args[1]->attrs->find(state.symbols.create(attr));
     if (i == args[1]->attrs->end())
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("attribute '%1%' missing", attr),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("attribute '%1%' missing", attr),
+            .nixCode = NixCode { .errPos = pos }
+        });
     // !!! add to stack trace?
     if (state.countCalls && i->pos) state.attrSelects[*i->pos]++;
     state.forceValue(*i->value, pos);
@@ -1398,22 +1362,20 @@ static void prim_listToAttrs(EvalState & state, const Pos & pos, Value * * args,
 
         Bindings::iterator j = v2.attrs->find(state.sName);
         if (j == v2.attrs->end())
-            throw TypeError(
-                ErrorInfo { 
-                    .hint = hintfmt("'name' attribute missing in a call to 'listToAttrs'"), 
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw TypeError({
+                .hint = hintfmt("'name' attribute missing in a call to 'listToAttrs'"),
+                .nixCode = NixCode { .errPos = pos }
+            });
         string name = state.forceStringNoCtx(*j->value, pos);
 
         Symbol sym = state.symbols.create(name);
         if (seen.insert(sym).second) {
             Bindings::iterator j2 = v2.attrs->find(state.symbols.create(state.sValue));
             if (j2 == v2.attrs->end())
-                throw TypeError(
-                    ErrorInfo { 
-                        .hint = hintfmt("'value' attribute missing in a call to 'listToAttrs'"), 
-                        .nixCode = NixCode { .errPos = pos }
-                    });
+                throw TypeError({
+                    .hint = hintfmt("'value' attribute missing in a call to 'listToAttrs'"),
+                    .nixCode = NixCode { .errPos = pos }
+                });
             v.attrs->push_back(Attr(sym, j2->value, j2->pos));
         }
     }
@@ -1486,11 +1448,10 @@ static void prim_functionArgs(EvalState & state, const Pos & pos, Value * * args
 {
     state.forceValue(*args[0], pos);
     if (args[0]->type != tLambda)
-        throw TypeError(
-            ErrorInfo { 
-                .hint = hintfmt("'functionArgs' requires a function"), 
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw TypeError({
+            .hint = hintfmt("'functionArgs' requires a function"),
+            .nixCode = NixCode { .errPos = pos }
+        });
 
     if (!args[0]->lambda.fun->matchAttrs) {
         state.mkAttrs(v, 0);
@@ -1543,11 +1504,10 @@ static void elemAt(EvalState & state, const Pos & pos, Value & list, int n, Valu
 {
     state.forceList(list, pos);
     if (n < 0 || (unsigned int) n >= list.listSize())
-        throw Error(
-            ErrorInfo { 
-                .hint = hintfmt("list index %1% is out of bounds", n), 
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw Error({
+            .hint = hintfmt("list index %1% is out of bounds", n),
+            .nixCode = NixCode { .errPos = pos }
+        });
     state.forceValue(*list.listElems()[n], pos);
     v = *list.listElems()[n];
 }
@@ -1574,11 +1534,10 @@ static void prim_tail(EvalState & state, const Pos & pos, Value * * args, Value
 {
     state.forceList(*args[0], pos);
     if (args[0]->listSize() == 0)
-        throw Error(
-            ErrorInfo { 
-                .hint = hintfmt("'tail' called on an empty list"), 
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw Error({
+            .hint = hintfmt("'tail' called on an empty list"),
+            .nixCode = NixCode { .errPos = pos }
+        });
 
     state.mkList(v, args[0]->listSize() - 1);
     for (unsigned int n = 0; n < v.listSize(); ++n)
@@ -1720,12 +1679,10 @@ static void prim_genList(EvalState & state, const Pos & pos, Value * * args, Val
     auto len = state.forceInt(*args[1], pos);
 
     if (len < 0)
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("cannot create list of size %1%", len), 
-                .nixCode = NixCode { .errPos = pos }
-            });
-
+        throw EvalError({
+            .hint = hintfmt("cannot create list of size %1%", len),
+            .nixCode = NixCode { .errPos = pos }
+        });
 
     state.mkList(v, len);
 
@@ -1883,12 +1840,11 @@ static void prim_div(EvalState & state, const Pos & pos, Value * * args, Value &
     state.forceValue(*args[1], pos);
 
     NixFloat f2 = state.forceFloat(*args[1], pos);
-    if (f2 == 0) 
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("division by zero"), 
-                .nixCode = NixCode { .errPos = pos }
-            });
+    if (f2 == 0)
+        throw EvalError({
+            .hint = hintfmt("division by zero"),
+            .nixCode = NixCode { .errPos = pos }
+        });
 
     if (args[0]->type == tFloat || args[1]->type == tFloat) {
         mkFloat(v, state.forceFloat(*args[0], pos) / state.forceFloat(*args[1], pos));
@@ -1897,11 +1853,10 @@ static void prim_div(EvalState & state, const Pos & pos, Value * * args, Value &
         NixInt i2 = state.forceInt(*args[1], pos);
         /* Avoid division overflow as it might raise SIGFPE. */
         if (i1 == std::numeric_limits<NixInt>::min() && i2 == -1)
-            throw EvalError(
-                ErrorInfo { 
-                    .hint = hintfmt("overflow in integer division"), 
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("overflow in integer division"),
+                .nixCode = NixCode { .errPos = pos }
+            });
 
         mkInt(v, i1 / i2);
     }
@@ -1958,12 +1913,11 @@ static void prim_substring(EvalState & state, const Pos & pos, Value * * args, V
     PathSet context;
     string s = state.coerceToString(pos, *args[2], context);
 
-    if (start < 0) 
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("negative start position in 'substring'"), 
-                .nixCode = NixCode { .errPos = pos }
-            });
+    if (start < 0)
+        throw EvalError({
+            .hint = hintfmt("negative start position in 'substring'"),
+            .nixCode = NixCode { .errPos = pos }
+        });
 
     mkString(v, (unsigned int) start >= s.size() ? "" : string(s, start, len), context);
 }
@@ -1983,11 +1937,10 @@ static void prim_hashString(EvalState & state, const Pos & pos, Value * * args,
     string type = state.forceStringNoCtx(*args[0], pos);
     HashType ht = parseHashType(type);
     if (ht == htUnknown)
-        throw Error(
-            ErrorInfo { 
-                .hint = hintfmt("unknown hash type '%1%'", type), 
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw Error({
+            .hint = hintfmt("unknown hash type '%1%'", type),
+            .nixCode = NixCode { .errPos = pos }
+        });
 
     PathSet context; // discarded
     string s = state.forceString(*args[1], context, pos);
@@ -2030,17 +1983,15 @@ void prim_match(EvalState & state, const Pos & pos, Value * * args, Value & v)
     } catch (std::regex_error &e) {
         if (e.code() == std::regex_constants::error_space) {
             // limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
-            throw EvalError(
-                ErrorInfo {
-                    .hint = hintfmt("memory limit exceeded by regular expression '%s'", re),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("memory limit exceeded by regular expression '%s'", re),
+                .nixCode = NixCode { .errPos = pos }
+            });
         } else {
-            throw EvalError(
-                ErrorInfo {
-                    .hint = hintfmt("invalid regular expression '%s'", re),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("invalid regular expression '%s'", re),
+                .nixCode = NixCode { .errPos = pos }
+            });
         }
     }
 }
@@ -2105,17 +2056,15 @@ static void prim_split(EvalState & state, const Pos & pos, Value * * args, Value
     } catch (std::regex_error &e) {
         if (e.code() == std::regex_constants::error_space) {
             // limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
-            throw EvalError(
-                ErrorInfo {
-                    .hint = hintfmt("memory limit exceeded by regular expression '%s'", re),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("memory limit exceeded by regular expression '%s'", re),
+                .nixCode = NixCode { .errPos = pos }
+            });
         } else {
-            throw EvalError(
-                ErrorInfo {
-                    .hint = hintfmt("invalid regular expression '%s'", re),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("invalid regular expression '%s'", re),
+                .nixCode = NixCode { .errPos = pos }
+            });
         }
     }
 }
@@ -2146,11 +2095,10 @@ static void prim_replaceStrings(EvalState & state, const Pos & pos, Value * * ar
     state.forceList(*args[0], pos);
     state.forceList(*args[1], pos);
     if (args[0]->listSize() != args[1]->listSize())
-        throw EvalError(
-            ErrorInfo { 
-                .hint = hintfmt("'from' and 'to' arguments to 'replaceStrings' have different lengths"), 
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("'from' and 'to' arguments to 'replaceStrings' have different lengths"),
+            .nixCode = NixCode { .errPos = pos }
+        });
 
     vector<string> from;
     from.reserve(args[0]->listSize());
diff --git a/src/libexpr/primops/context.cc b/src/libexpr/primops/context.cc
index 7f895fc01..efa2e9576 100644
--- a/src/libexpr/primops/context.cc
+++ b/src/libexpr/primops/context.cc
@@ -146,11 +146,10 @@ static void prim_appendContext(EvalState & state, const Pos & pos, Value * * arg
     auto sAllOutputs = state.symbols.create("allOutputs");
     for (auto & i : *args[1]->attrs) {
         if (!state.store->isStorePath(i.name))
-            throw EvalError(
-                ErrorInfo { 
-                    .hint = hintfmt("Context key '%s' is not a store path", i.name),
-                    .nixCode = NixCode { .errPos = *i.pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("Context key '%s' is not a store path", i.name),
+                .nixCode = NixCode { .errPos = *i.pos }
+            });
         if (!settings.readOnlyMode)
             state.store->ensurePath(state.store->parseStorePath(i.name));
         state.forceAttrs(*i.value, *i.pos);
@@ -164,11 +163,10 @@ static void prim_appendContext(EvalState & state, const Pos & pos, Value * * arg
         if (iter != i.value->attrs->end()) {
             if (state.forceBool(*iter->value, *iter->pos)) {
                 if (!isDerivation(i.name)) {
-                    throw EvalError(
-                        ErrorInfo { 
-                            .hint = hintfmt("Tried to add all-outputs context of %s, which is not a derivation, to a string", i.name),
-                            .nixCode = NixCode { .errPos = *i.pos }
-                        });
+                    throw EvalError({
+                        .hint = hintfmt("Tried to add all-outputs context of %s, which is not a derivation, to a string", i.name),
+                        .nixCode = NixCode { .errPos = *i.pos }
+                    });
                 }
                 context.insert("=" + string(i.name));
             }
@@ -178,11 +176,10 @@ static void prim_appendContext(EvalState & state, const Pos & pos, Value * * arg
         if (iter != i.value->attrs->end()) {
             state.forceList(*iter->value, *iter->pos);
             if (iter->value->listSize() && !isDerivation(i.name)) {
-                throw EvalError(
-                    ErrorInfo { 
-                        .hint = hintfmt("Tried to add derivation output context of %s, which is not a derivation, to a string", i.name),
-                        .nixCode = NixCode { .errPos = *i.pos }
-                    });
+                throw EvalError({
+                    .hint = hintfmt("Tried to add derivation output context of %s, which is not a derivation, to a string", i.name),
+                    .nixCode = NixCode { .errPos = *i.pos }
+                });
             }
             for (unsigned int n = 0; n < iter->value->listSize(); ++n) {
                 auto name = state.forceStringNoCtx(*iter->value->listElems()[n], *iter->pos);
diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc
index 52826b56c..dd7229a3d 100644
--- a/src/libexpr/primops/fetchGit.cc
+++ b/src/libexpr/primops/fetchGit.cc
@@ -35,19 +35,17 @@ static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Va
             else if (n == "submodules")
                 fetchSubmodules = state.forceBool(*attr.value, *attr.pos);
             else
-                throw EvalError(
-                    ErrorInfo { 
-                        .hint = hintfmt("unsupported argument '%s' to 'fetchGit'", attr.name),
-                        .nixCode = NixCode { .errPos = *attr.pos }
-                    });
+                throw EvalError({
+                    .hint = hintfmt("unsupported argument '%s' to 'fetchGit'", attr.name),
+                    .nixCode = NixCode { .errPos = *attr.pos }
+                });
         }
 
         if (url.empty())
-            throw EvalError(
-                ErrorInfo { 
-                    .hint = hintfmt("'url' argument required"),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("'url' argument required"),
+                .nixCode = NixCode { .errPos = pos }
+            });
 
     } else
         url = state.coerceToString(pos, *args[0], context, false, false);
diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc
index bb008ba6b..9bace8f89 100644
--- a/src/libexpr/primops/fetchMercurial.cc
+++ b/src/libexpr/primops/fetchMercurial.cc
@@ -38,19 +38,17 @@ static void prim_fetchMercurial(EvalState & state, const Pos & pos, Value * * ar
             else if (n == "name")
                 name = state.forceStringNoCtx(*attr.value, *attr.pos);
             else
-                throw EvalError(
-                    ErrorInfo { 
-                        .hint = hintfmt("unsupported argument '%s' to 'fetchMercurial'", attr.name),
-                        .nixCode = NixCode { .errPos = *attr.pos }
-                    });
+                throw EvalError({
+                    .hint = hintfmt("unsupported argument '%s' to 'fetchMercurial'", attr.name),
+                    .nixCode = NixCode { .errPos = *attr.pos }
+                });
         }
 
         if (url.empty())
-            throw EvalError(
-                ErrorInfo { 
-                    .hint = hintfmt("'url' argument required"),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("'url' argument required"),
+                .nixCode = NixCode { .errPos = pos }
+            });
 
     } else
         url = state.coerceToString(pos, *args[0], context, false, false);
diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc
index 62bc4f433..9be93710a 100644
--- a/src/libexpr/primops/fetchTree.cc
+++ b/src/libexpr/primops/fetchTree.cc
@@ -66,11 +66,10 @@ static void prim_fetchTree(EvalState & state, const Pos & pos, Value * * args, V
         }
 
         if (!attrs.count("type"))
-            throw Error(
-                ErrorInfo {
-                    .hint = hintfmt("attribute 'type' is missing in call to 'fetchTree'"),
-                    .nixCode = NixCode { .errPos = pos }
-                    });
+            throw Error({
+                .hint = hintfmt("attribute 'type' is missing in call to 'fetchTree'"),
+                .nixCode = NixCode { .errPos = pos }
+            });
 
         input = fetchers::inputFromAttrs(attrs);
     } else
@@ -111,20 +110,17 @@ static void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
             else if (n == "name")
                 name = state.forceStringNoCtx(*attr.value, *attr.pos);
             else
-                throw EvalError(
-                    ErrorInfo {
-                        .hint = hintfmt("unsupported argument '%s' to '%s'",
-                            attr.name, who),
-                        .nixCode = NixCode { .errPos = *attr.pos }
-                    });
+                throw EvalError({
+                    .hint = hintfmt("unsupported argument '%s' to '%s'", attr.name, who),
+                    .nixCode = NixCode { .errPos = *attr.pos }
+                });
             }
 
         if (!url)
-            throw EvalError(
-                ErrorInfo {
-                    .hint = hintfmt("'url' argument required"),
-                    .nixCode = NixCode { .errPos = pos }
-                });
+            throw EvalError({
+                .hint = hintfmt("'url' argument required"),
+                .nixCode = NixCode { .errPos = pos }
+            });
     } else
         url = state.forceStringNoCtx(*args[0], pos);
 
diff --git a/src/libexpr/primops/fromTOML.cc b/src/libexpr/primops/fromTOML.cc
index 948069401..7615d1379 100644
--- a/src/libexpr/primops/fromTOML.cc
+++ b/src/libexpr/primops/fromTOML.cc
@@ -81,11 +81,10 @@ static void prim_fromTOML(EvalState & state, const Pos & pos, Value * * args, Va
     try {
         visit(v, parser(tomlStream).parse());
     } catch (std::runtime_error & e) {
-        throw EvalError(
-            ErrorInfo {
-                .hint = hintfmt("while parsing a TOML string: %s", e.what()),
-                .nixCode = NixCode { .errPos = pos }
-            });
+        throw EvalError({
+            .hint = hintfmt("while parsing a TOML string: %s", e.what()),
+            .nixCode = NixCode { .errPos = pos }
+        });
     }
 }
 
-- 
cgit v1.2.3


From e14e62fddde3b00ee82a8da29725f571ad8ecee1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 15 Jun 2020 14:12:39 +0200
Subject: Remove trailing whitespace

---
 src/libexpr/attr-path.cc | 4 ++--
 src/libexpr/lexer.l      | 1 -
 src/libexpr/nixexpr.cc   | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc
index 9a9531a3f..8980bc09d 100644
--- a/src/libexpr/attr-path.cc
+++ b/src/libexpr/attr-path.cc
@@ -62,7 +62,7 @@ std::pair<Value *, Pos> findAlongAttrPath(EvalState & state, const string & attr
                 throw TypeError(
                     "the expression selected by the selection path '%1%' should be a set but is %2%",
                     attrPath,
-                    showType(*v)); 
+                    showType(*v));
             if (attr.empty())
                 throw Error("empty attribute name in selection path '%1%'", attrPath);
 
@@ -79,7 +79,7 @@ std::pair<Value *, Pos> findAlongAttrPath(EvalState & state, const string & attr
                 throw TypeError(
                     "the expression selected by the selection path '%1%' should be a list but is %2%",
                     attrPath,
-                    showType(*v)); 
+                    showType(*v));
             if (attrIndex >= v->listSize())
                 throw AttrPathNotFound("list index %1% in selection path '%2%' is out of range", attrIndex, attrPath);
 
diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l
index 85376a08f..f6e83926b 100644
--- a/src/libexpr/lexer.l
+++ b/src/libexpr/lexer.l
@@ -219,4 +219,3 @@ or          { return OR_KW; }
             }
 
 %%
-
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index 5b2dd9751..b4b65883d 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -267,7 +267,7 @@ void ExprVar::bindVars(const StaticEnv & env)
     /* Otherwise, the variable must be obtained from the nearest
        enclosing `with'.  If there is no `with', then we can issue an
        "undefined variable" error now. */
-    if (withLevel == -1) 
+    if (withLevel == -1)
         throw UndefinedVarError({
             .hint = hintfmt("undefined variable '%1%'", name),
             .nixCode = NixCode { .errPos = pos }
-- 
cgit v1.2.3


From ccfa6b3eee9f5e613152a4b373f67ff05696adf8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 15 Jun 2020 16:12:27 +0200
Subject: Give better error message about <...> in pure eval mode

---
 src/libexpr/parser.y | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index a1188dec0..a639be64e 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -689,7 +689,10 @@ Path EvalState::findFile(SearchPath & searchPath, const string & path, const Pos
         if (pathExists(res)) return canonPath(res);
     }
     throw ThrownError({
-        .hint = hintfmt("file '%1%' was not found in the Nix search path (add it using $NIX_PATH or -I)", path),
+        .hint = hintfmt(evalSettings.pureEval
+            ? "cannot look up '<%s>' in pure evaluation mode (use '--impure' to override)"
+            : "file '%s' was not found in the Nix search path (add it using $NIX_PATH or -I)",
+            path),
         .nixCode = NixCode { .errPos = pos }
     });
 }
-- 
cgit v1.2.3


From 759947bf72c134592f0ce23d385e48095bd0a301 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 16 Jun 2020 14:16:39 +0200
Subject: StorePath: Rewrite in C++

On nix-env -qa -f '<nixpkgs>', this reduces maximum RSS by 20970 KiB
and runtime by 0.8%. This is mostly because we're not parsing the hash
part as a hash anymore (just validating that it consists of base-32
characters).

Also, replace storePathToHash() by StorePath::hashPart().
---
 src/libexpr/local.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk
index 917e8a1c7..9ed39e745 100644
--- a/src/libexpr/local.mk
+++ b/src/libexpr/local.mk
@@ -8,7 +8,7 @@ libexpr_SOURCES := $(wildcard $(d)/*.cc) $(wildcard $(d)/primops/*.cc) $(d)/lexe
 
 libexpr_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libmain -I src/libexpr
 
-libexpr_LIBS = libutil libstore libfetchers libnixrust
+libexpr_LIBS = libutil libstore libfetchers
 
 libexpr_LDFLAGS =
 ifneq ($(OS), FreeBSD)
-- 
cgit v1.2.3


From 29542865cee37ab22efe1bd142900b69f6c59f0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 16 Jun 2020 22:20:18 +0200
Subject: Remove StorePath::clone() and related functions

---
 src/libexpr/primops.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 62e5163c9..907f15246 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -55,7 +55,7 @@ void EvalState::realiseContext(const PathSet & context)
         if (!store->isValidPath(ctx))
             throw InvalidPathError(store->printStorePath(ctx));
         if (!decoded.second.empty() && ctx.isDerivation()) {
-            drvs.push_back(StorePathWithOutputs{ctx.clone(), {decoded.second}});
+            drvs.push_back(StorePathWithOutputs{ctx, {decoded.second}});
 
             /* Add the output of this derivation to the allowed
                paths. */
@@ -723,9 +723,9 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
             StorePathSet refs;
             state.store->computeFSClosure(state.store->parseStorePath(std::string_view(path).substr(1)), refs);
             for (auto & j : refs) {
-                drv.inputSrcs.insert(j.clone());
+                drv.inputSrcs.insert(j);
                 if (j.isDerivation())
-                    drv.inputDrvs[j.clone()] = state.store->readDerivation(j).outputNames();
+                    drv.inputDrvs[j] = state.store->readDerivation(j).outputNames();
             }
         }
 
@@ -792,7 +792,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
         for (auto & i : outputs) {
             if (!jsonObject) drv.env[i] = "";
             drv.outputs.insert_or_assign(i,
-                DerivationOutput(StorePath::dummy.clone(), "", ""));
+                DerivationOutput { StorePath::dummy, "", "" });
         }
 
         Hash h = hashDerivationModulo(*state.store, Derivation(drv), true);
@@ -801,7 +801,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
             auto outPath = state.store->makeOutputPath(i, h, drvName);
             if (!jsonObject) drv.env[i] = state.store->printStorePath(outPath);
             drv.outputs.insert_or_assign(i,
-                DerivationOutput(std::move(outPath), "", ""));
+                DerivationOutput { std::move(outPath), "", "" });
         }
     }
 
@@ -814,7 +814,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
     /* Optimisation, but required in read-only mode! because in that
        case we don't actually write store derivations, so we can't
        read them later. */
-    drvHashes.insert_or_assign(drvPath.clone(),
+    drvHashes.insert_or_assign(drvPath,
         hashDerivationModulo(*state.store, Derivation(drv), false));
 
     state.mkAttrs(v, 1 + drv.outputs.size());
-- 
cgit v1.2.3