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/src/phase/binary.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dhall')

diff --git a/dhall/src/phase/binary.rs b/dhall/src/phase/binary.rs
index 30aa7a0..249d7c7 100644
--- a/dhall/src/phase/binary.rs
+++ b/dhall/src/phase/binary.rs
@@ -85,9 +85,9 @@ fn cbor_value_to_dhall(data: &cbor::Value) -> Result<ParsedExpr, DecodeError> {
                     5 => NaturalTimes,
                     6 => TextAppend,
                     7 => ListAppend,
-                    8 => Combine,
-                    9 => Prefer,
-                    10 => CombineTypes,
+                    8 => RecursiveRecordMerge,
+                    9 => RightBiasedRecordMerge,
+                    10 => RecursiveRecordTypeMerge,
                     11 => ImportAlt,
                     _ => {
                         Err(DecodeError::WrongFormatError("binop".to_owned()))?
-- 
cgit v1.2.3