From fa6de4c077ab4f1c28d2ec64a33a3be8c5a9bb1c Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 22 Dec 2019 18:24:21 +0000
Subject: Update dhall-lang submodule

---
 dhall/src/error/mod.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'dhall/src/error/mod.rs')

diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs
index 1288c12..40cccac 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -76,6 +76,7 @@ pub(crate) enum TypeMessage {
     MergeHandlerReturnTypeMustNotBeDependent,
     ProjectionMustBeRecord,
     ProjectionMissingEntry,
+    ProjectionDuplicateField,
     Sort,
     RecordTypeDuplicateField,
     RecordTypeMergeRequiresRecordType(Value),
-- 
cgit v1.2.3


From f22eb87b7a7aeccfa556dcdb56148e89cee023db Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 24 Dec 2019 18:10:12 +0000
Subject: Add debug output to unhandled type error message

---
 dhall/src/error/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dhall/src/error/mod.rs')

diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs
index 40cccac..8976478 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -125,7 +125,7 @@ impl std::fmt::Display for TypeError {
                         y
                     ))
             }
-            _ => "Type error: Unhandled error".to_string(),
+            _ => format!("Type error: Unhandled error: {:?}", self.message),
         };
         write!(f, "{}", msg)
     }
-- 
cgit v1.2.3


From 5f52c5bda0277edd87323eb67dcda721cd18a9d3 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 24 Dec 2019 20:23:19 +0000
Subject: Extend merge to work on Optionals

---
 dhall/src/error/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dhall/src/error/mod.rs')

diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs
index 8976478..6e7be64 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -67,7 +67,7 @@ pub(crate) enum TypeMessage {
     BinOpTypeMismatch(BinOp, Value),
     InvalidTextInterpolation(Value),
     Merge1ArgMustBeRecord(Value),
-    Merge2ArgMustBeUnion(Value),
+    Merge2ArgMustBeUnionOrOptional(Value),
     MergeEmptyNeedsAnnotation,
     MergeHandlerMissingVariant(Label),
     MergeVariantMissingHandler(Label),
-- 
cgit v1.2.3