diff options
| author | Nadrieril | 2019-12-24 20:23:19 +0000 |
|---|---|---|
| committer | Nadrieril | 2019-12-24 20:23:35 +0000 |
| commit | 5f52c5bda0277edd87323eb67dcda721cd18a9d3 (patch) | |
| tree | bd7fb979dbad1228655dfc64898d30e7817110b6 /dhall/src/error | |
| parent | f22eb87b7a7aeccfa556dcdb56148e89cee023db (diff) | |
Extend merge to work on Optionals
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 8976478..6e7be64 100644 --- a/dhall/src/error/mod.rs +++ b/dhall/src/error/mod.rs @@ -67,7 +67,7 @@ pub(crate) enum TypeMessage { BinOpTypeMismatch(BinOp, Value), InvalidTextInterpolation(Value), Merge1ArgMustBeRecord(Value), - Merge2ArgMustBeUnion(Value), + Merge2ArgMustBeUnionOrOptional(Value), MergeEmptyNeedsAnnotation, MergeHandlerMissingVariant(Label), MergeVariantMissingHandler(Label), |