summaryrefslogtreecommitdiff
path: root/dhall/src/error/mod.rs
diff options
context:
space:
mode:
authorNadrieril Feneanar2019-08-03 20:59:50 +0200
committerGitHub2019-08-03 20:59:50 +0200
commit30bc224b524031fbf64057516961831890bb749c (patch)
treee5e85ade0666ad17011a44069bb6e8ae7528f801 /dhall/src/error/mod.rs
parent925bf5b5cb7d10301d0a92214bc13d8eb53bf035 (diff)
parent9447cb5d36dfc0b1b9a4bbaf09c82579fd59b7a2 (diff)
Merge pull request #92 from FintanH/fintan/typecheck-combine-types
Add typechecking for RecursiveRecordTypeMerge
Diffstat (limited to 'dhall/src/error/mod.rs')
-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 bc5322a..aed6ccd 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -83,6 +83,8 @@ pub(crate) enum TypeMessage {
Sort,
RecordMismatch(Typed, Typed),
RecordTypeDuplicateField,
+ RecordTypeMergeRequiresRecordType(Type),
+ RecordTypeMismatch(Type, Type, Type, Type),
UnionTypeDuplicateField,
Unimplemented,
}