summaryrefslogtreecommitdiff
path: root/dhall/src/error
diff options
context:
space:
mode:
authorNadrieril Feneanar2019-08-03 19:01:40 +0200
committerGitHub2019-08-03 19:01:40 +0200
commit9113e15534f57626ae9be662738e1d3d22434e88 (patch)
treeb29bf3db1ee8b482c9c41bec6b3ebabccb3465c9 /dhall/src/error
parent4b82e03dfaaeec98562aa2bff25ad38079d35c9c (diff)
parentdceabb85e407b8e0e52105a725f3bb782fa474de (diff)
Merge pull request #88 from FintanH/fintan/typecheck-prefer
Add case for RightBasedRecordMerge in the typechecking phase.
Diffstat (limited to '')
-rw-r--r--dhall/src/error/mod.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs
index 125d013..20b8636 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -76,9 +76,11 @@ pub(crate) enum TypeMessage {
MergeAnnotMismatch,
MergeHandlerTypeMismatch,
MergeHandlerReturnTypeMustNotBeDependent,
+ MustCombineRecord(Typed),
ProjectionMustBeRecord,
ProjectionMissingEntry,
Sort,
+ RecordMismatch(Typed, Typed),
RecordTypeDuplicateField,
UnionTypeDuplicateField,
Unimplemented,