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/core/expr.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'dhall_syntax/src/core/expr.rs')

diff --git a/dhall_syntax/src/core/expr.rs b/dhall_syntax/src/core/expr.rs
index 113512b..3bc7504 100644
--- a/dhall_syntax/src/core/expr.rs
+++ b/dhall_syntax/src/core/expr.rs
@@ -89,11 +89,11 @@ pub enum BinOp {
     /// x && y`
     BoolAnd,
     /// x ∧ y`
-    Combine,
-    /// x // y
-    Prefer,
-    /// x //\\ y
-    CombineTypes,
+    RecursiveRecordMerge,
+    /// x ⫽ y
+    RightBiasedRecordMerge,
+    /// x ⩓ y
+    RecursiveRecordTypeMerge,
     /// x * y`
     NaturalTimes,
     /// x == y`
-- 
cgit v1.2.3