summaryrefslogtreecommitdiff
path: root/dhall_syntax/src/parser.rs
diff options
context:
space:
mode:
Diffstat (limited to 'dhall_syntax/src/parser.rs')
-rw-r--r--dhall_syntax/src/parser.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/dhall_syntax/src/parser.rs b/dhall_syntax/src/parser.rs
index 83ccc1e..51dbfd2 100644
--- a/dhall_syntax/src/parser.rs
+++ b/dhall_syntax/src/parser.rs
@@ -762,21 +762,21 @@ make_parser! {
rule!(combine_expression<ParsedSubExpr> as expression; children!(
[expression(e)] => e,
[expression(first), expression(rest)..] => {
- let o = crate::BinOp::Combine;
+ let o = crate::BinOp::RecursiveRecordMerge;
rest.fold(first, |acc, e| unspanned(BinOp(o, acc, e)))
},
));
rule!(prefer_expression<ParsedSubExpr> as expression; children!(
[expression(e)] => e,
[expression(first), expression(rest)..] => {
- let o = crate::BinOp::Prefer;
+ let o = crate::BinOp::RightBiasedRecordMerge;
rest.fold(first, |acc, e| unspanned(BinOp(o, acc, e)))
},
));
rule!(combine_types_expression<ParsedSubExpr> as expression; children!(
[expression(e)] => e,
[expression(first), expression(rest)..] => {
- let o = crate::BinOp::CombineTypes;
+ let o = crate::BinOp::RecursiveRecordTypeMerge;
rest.fold(first, |acc, e| unspanned(BinOp(o, acc, e)))
},
));