summaryrefslogtreecommitdiff
path: root/dhall/src/phase
diff options
context:
space:
mode:
authorNadrieril2019-05-08 17:29:23 +0200
committerNadrieril2019-05-08 17:29:23 +0200
commit7aafedae36fe81a64720592f75723b6646913fe2 (patch)
tree4f2c76ffa6930183023cbe7a4946c589403c3191 /dhall/src/phase
parent1ea478858573045e5d3e3f8ccc3773021ea68ffa (diff)
Rename the record combining operators internally
Diffstat (limited to '')
-rw-r--r--dhall/src/phase/binary.rs6
1 files changed, 3 insertions, 3 deletions
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()))?