From 6febba3f2026a3b8c2bb98d85facad0ad0605d02 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 8 May 2019 23:14:27 +0200
Subject: Typecheck merge

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

(limited to 'dhall/src/error')

diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs
index bb1acbd..3efa77e 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -62,6 +62,13 @@ pub(crate) enum TypeMessage {
     BinOpTypeMismatch(BinOp, Typed),
     NoDependentTypes(Normalized, Normalized),
     InvalidTextInterpolation(Typed),
+    Merge1ArgMustBeRecord(Typed),
+    Merge2ArgMustBeUnion(Typed),
+    MergeEmptyNeedsAnnotation,
+    MergeHandlerMissingVariant(Label),
+    MergeVariantMissingHandler(Label),
+    MergeAnnotMismatch,
+    MergeHandlerTypeMismatch,
     Sort,
     Unimplemented,
 }
-- 
cgit v1.2.3