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: [PATCH] Disambiguate BaseError(Args) constructor

This means that 'throw Error({ ... ErrorInfo ... })' now works.
---
 src/libexpr/eval.cc  | 9 ++++-----
 src/libutil/types.hh | 3 ---
 2 files changed, 4 insertions(+), 8 deletions(-)

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))
diff --git a/src/libutil/types.hh b/src/libutil/types.hh
index 89ae108f9..3af485fa0 100644
--- a/src/libutil/types.hh
+++ b/src/libutil/types.hh
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include "ref.hh"
 
 #include <list>
@@ -25,7 +24,6 @@ typedef string Path;
 typedef list<Path> Paths;
 typedef set<Path> PathSet;
 
-
 /* Helper class to run code at startup. */
 template<typename T>
 struct OnStartup
@@ -33,5 +31,4 @@ struct OnStartup
     OnStartup(T && t) { t(); }
 };
 
-
 }