summaryrefslogtreecommitdiff
path: root/dhall/src/error
diff options
context:
space:
mode:
authorNadrieril2019-05-08 23:14:27 +0200
committerNadrieril2019-05-08 23:14:27 +0200
commit6febba3f2026a3b8c2bb98d85facad0ad0605d02 (patch)
treebe42372736b69e62b2957e1a67f544a525533b8e /dhall/src/error
parent894424b61ecc72794976372bc5866734fd3a6d63 (diff)
Typecheck merge
Diffstat (limited to '')
-rw-r--r--dhall/src/error/mod.rs7
1 files changed, 7 insertions, 0 deletions
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,
}