diff options
| author | Nadrieril | 2019-08-13 21:10:59 +0200 |
|---|---|---|
| committer | Nadrieril | 2019-08-13 21:10:59 +0200 |
| commit | 51dbaa0b66089bca63aa9cf69a1e0ec59df053b9 (patch) | |
| tree | 59e834f95417ad798bb49c0bdc0911c8c44a3a4a /dhall/src/core/value.rs | |
| parent | 77af0bbc171618f48531cc6b1d77e18089928885 (diff) | |
Considerably simplify Embed handling
Diffstat (limited to '')
| -rw-r--r-- | dhall/src/core/value.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dhall/src/core/value.rs b/dhall/src/core/value.rs index 88d7a20..20a6021 100644 --- a/dhall/src/core/value.rs +++ b/dhall/src/core/value.rs @@ -243,7 +243,7 @@ impl Value { y.normalize_to_expr_maybe_alpha(alpha), )), Value::PartialExpr(e) => { - rc(e.map_ref_simple(|v| v.normalize_to_expr_maybe_alpha(alpha))) + rc(e.map_ref(|v| v.normalize_to_expr_maybe_alpha(alpha))) } } } @@ -333,8 +333,8 @@ impl Value { y.normalize_mut(); } Value::PartialExpr(e) => { - // TODO: need map_mut_simple - e.map_ref_simple(|v| { + // TODO: need map_mut + e.map_ref(|v| { v.normalize_nf(); }); } @@ -475,7 +475,6 @@ impl Shift for Value { e.traverse_ref_with_special_handling_of_binders( |v| Ok(v.shift(delta, var)?), |x, v| Ok(v.shift(delta, &var.under_binder(x))?), - |x| Ok(Normalized::clone(x)), )?, ), }) @@ -500,7 +499,6 @@ impl Subst<Typed> for Value { &val.under_binder(x), ) }, - Normalized::clone, )) } // Retry normalizing since substituting may allow progress |