From 7aafedae36fe81a64720592f75723b6646913fe2 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 8 May 2019 17:29:23 +0200
Subject: Rename the record combining operators internally

---
 dhall_syntax/src/parser.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dhall_syntax/src/parser.rs')

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)))
         },
     ));
-- 
cgit v1.2.3