From 0d4e033c7ca301f03453210fdef345bdf8018892 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 24 Jan 2020 17:12:22 +0000
Subject: Update type-errors

---
 dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt')

diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
index ae36eef..19f375a 100644
--- a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
+++ b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
@@ -10,4 +10,4 @@
 1 | merge { x = λ(_ : Bool) → _ } (< x : Natural >.x 1)␊
   |                   ^--^
   |
-  = But the function expected an argument of type Value@NF { value: AppliedBuiltin(Bool, []), type: Type }
+  = But the function expected an argument of type Value@NF { value: AppliedBuiltin(Bool, [], []), type: Type }
-- 
cgit v1.2.3


From 8c64ae33149db4edaaa89d2d187baf10a2b9f8bf Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sat, 25 Jan 2020 13:29:27 +0000
Subject: Make most type errors stringy

---
 .../unit/MergeHandlerNotMatchAlternativeType.txt           | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt')

diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
index 19f375a..9342fd8 100644
--- a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
+++ b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
@@ -1,13 +1 @@
-[unknown location] Type error: Wrong type of function argument
- --> 1:38
-  |
-1 | merge { x = λ(_ : Bool) → _ } (< x : Natural >.x 1)␊
-  |                                      ^-----^
-  |
-  = This argument has type Type
- --> 1:19
-  |
-1 | merge { x = λ(_ : Bool) → _ } (< x : Natural >.x 1)␊
-  |                   ^--^
-  |
-  = But the function expected an argument of type Value@NF { value: AppliedBuiltin(Bool, [], []), type: Type }
+Type error: Unhandled error: TypeMismatch
-- 
cgit v1.2.3


From 1e466a20533d936f44430b1bc18508cd00e5ccd2 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 29 Jan 2020 18:48:19 +0000
Subject: Use TyExpr in Typed

---
 .../unit/MergeHandlerNotMatchAlternativeType.txt   | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt')

diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
index 9342fd8..77fed39 100644
--- a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
+++ b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
@@ -1 +1,21 @@
-Type error: Unhandled error: TypeMismatch
+Type error: Unhandled error: MergeHandlerTypeMismatch: Value@WHNF {
+    value: AppliedBuiltin(
+        Natural,
+        [],
+        [],
+        NzEnv {
+            items: [],
+        },
+    ),
+    type: Type,
+} != Value@WHNF {
+    value: AppliedBuiltin(
+        Bool,
+        [],
+        [],
+        NzEnv {
+            items: [],
+        },
+    ),
+    type: Type,
+}
-- 
cgit v1.2.3


From ec5fb594adf10b18a4457c3089ce4b00e2c50a39 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 30 Jan 2020 11:53:18 +0000
Subject: Remove debug output in type errors

---
 .../unit/MergeHandlerNotMatchAlternativeType.txt   | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt')

diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
index 77fed39..8b729a4 100644
--- a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
+++ b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
@@ -1,21 +1 @@
-Type error: Unhandled error: MergeHandlerTypeMismatch: Value@WHNF {
-    value: AppliedBuiltin(
-        Natural,
-        [],
-        [],
-        NzEnv {
-            items: [],
-        },
-    ),
-    type: Type,
-} != Value@WHNF {
-    value: AppliedBuiltin(
-        Bool,
-        [],
-        [],
-        NzEnv {
-            items: [],
-        },
-    ),
-    type: Type,
-}
+Type error: Unhandled error: MergeHandlerTypeMismatch
-- 
cgit v1.2.3