diff options
| author | FintanH | 2019-08-03 18:50:00 +0100 |
|---|---|---|
| committer | FintanH | 2019-08-03 18:50:00 +0100 |
| commit | a390b54b6a55a348b7fc000f9f81d395996a32c1 (patch) | |
| tree | 17c4f09f97961c2f7e23503548dd50fdebbf5f21 /dhall/src/error | |
| parent | fc309bf41dfe53d043766ec9d468389b2b4269ae (diff) | |
| parent | 9113e15534f57626ae9be662738e1d3d22434e88 (diff) | |
Merge remote-tracking branch 'origin/master' into fintan/typecheck-combine-types
Diffstat (limited to 'dhall/src/error')
| -rw-r--r-- | dhall/src/error/mod.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs index 2f65443..aef84a9 100644 --- a/dhall/src/error/mod.rs +++ b/dhall/src/error/mod.rs @@ -77,9 +77,11 @@ pub(crate) enum TypeMessage { MergeAnnotMismatch, MergeHandlerTypeMismatch, MergeHandlerReturnTypeMustNotBeDependent, + MustCombineRecord(Typed), ProjectionMustBeRecord, ProjectionMissingEntry, Sort, + RecordMismatch(Typed, Typed), RecordTypeDuplicateField, RecordTypeMergeRequiresRecordType(Type), RecordTypeMismatch(Type, Type, Type, Type), |