diff options
author | Nadrieril | 2019-05-08 17:29:23 +0200 |
---|---|---|
committer | Nadrieril | 2019-05-08 17:29:23 +0200 |
commit | 7aafedae36fe81a64720592f75723b6646913fe2 (patch) | |
tree | 4f2c76ffa6930183023cbe7a4946c589403c3191 /dhall_syntax/src/core | |
parent | 1ea478858573045e5d3e3f8ccc3773021ea68ffa (diff) |
Rename the record combining operators internally
Diffstat (limited to 'dhall_syntax/src/core')
-rw-r--r-- | dhall_syntax/src/core/expr.rs | 10 |
1 files changed, 5 insertions, 5 deletions
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` |