diff options
| author | Nadrieril Feneanar | 2019-08-03 20:16:15 +0200 |
|---|---|---|
| committer | GitHub | 2019-08-03 20:16:15 +0200 |
| commit | 925bf5b5cb7d10301d0a92214bc13d8eb53bf035 (patch) | |
| tree | 1012ed5c2443301b7af440a973a9573d3285d743 /dhall/src/error | |
| parent | 9113e15534f57626ae9be662738e1d3d22434e88 (diff) | |
| parent | 6bcb9bed4820f2307b1d3e512fa2d7252ba82f02 (diff) | |
Merge pull request #90 from FintanH/fintan/typecheck-combine
Add the typechecking of RecursiveRecordMerge.
Diffstat (limited to 'dhall/src/error')
| -rw-r--r-- | dhall/src/error/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs index 20b8636..bc5322a 100644 --- a/dhall/src/error/mod.rs +++ b/dhall/src/error/mod.rs @@ -55,6 +55,7 @@ pub(crate) enum TypeMessage { TypeMismatch(Typed, Normalized, Typed), AnnotMismatch(Typed, Normalized), Untyped, + FieldCollision(Label), InvalidListElement(usize, Normalized, Typed), InvalidListType(Normalized), InvalidOptionalType(Normalized), @@ -63,6 +64,7 @@ pub(crate) enum TypeMessage { IfBranchMustBeTerm(bool, Typed), InvalidFieldType(Label, Type), NotARecord(Label, Normalized), + MustCombineRecord(Typed), MissingRecordField(Label, Typed), MissingUnionField(Label, Normalized), BinOpTypeMismatch(BinOp, Typed), @@ -76,7 +78,6 @@ pub(crate) enum TypeMessage { MergeAnnotMismatch, MergeHandlerTypeMismatch, MergeHandlerReturnTypeMustNotBeDependent, - MustCombineRecord(Typed), ProjectionMustBeRecord, ProjectionMissingEntry, Sort, |