diff options
| author | FintanH | 2019-08-03 19:46:03 +0100 |
|---|---|---|
| committer | FintanH | 2019-08-03 19:46:03 +0100 |
| commit | 9447cb5d36dfc0b1b9a4bbaf09c82579fd59b7a2 (patch) | |
| tree | e5e85ade0666ad17011a44069bb6e8ae7528f801 /dhall/src/error | |
| parent | 8bc33c16e90ff6e1d2b4ddc7317a91190c9d8540 (diff) | |
| parent | 925bf5b5cb7d10301d0a92214bc13d8eb53bf035 (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, 1 insertions, 1 deletions
diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs index aef84a9..aed6ccd 100644 --- a/dhall/src/error/mod.rs +++ b/dhall/src/error/mod.rs @@ -64,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), @@ -77,7 +78,6 @@ pub(crate) enum TypeMessage { MergeAnnotMismatch, MergeHandlerTypeMismatch, MergeHandlerReturnTypeMustNotBeDependent, - MustCombineRecord(Typed), ProjectionMustBeRecord, ProjectionMissingEntry, Sort, |