diff options
author | Nadrieril | 2019-04-18 16:00:22 +0200 |
---|---|---|
committer | Nadrieril | 2019-04-18 16:00:33 +0200 |
commit | d8fb1cc0f5bdf6650424169b3bd841e611924760 (patch) | |
tree | 00fa2b45602db3086ed06f31858acd4a00e653ba /dhall/src/normalize.rs | |
parent | 22aa0081d314453bd1bb607384da3ed983dc4364 (diff) | |
parent | a0458fa3824ac301c8d0c1d7091e10d1468cbf91 (diff) |
Merge branch 'cleanup_map_mess'
Closes #83
Diffstat (limited to 'dhall/src/normalize.rs')
-rw-r--r-- | dhall/src/normalize.rs | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/dhall/src/normalize.rs b/dhall/src/normalize.rs index e0ed96c..a54e48e 100644 --- a/dhall/src/normalize.rs +++ b/dhall/src/normalize.rs @@ -325,20 +325,17 @@ fn normalize_ref(expr: &Expr<X, Normalized<'static>>) -> Expr<X, X> { }; match what_next { - Continue(e) => normalize_ref(&e.absurd_rec()), - ContinueSub(e) => normalize_ref(e.absurd().as_ref()), + Continue(e) => normalize_ref(&e.embed_absurd()), + ContinueSub(e) => normalize_ref(e.embed_absurd().as_ref()), Done(e) => e, DoneRef(e) => e.clone(), DoneRefSub(e) => e.unroll(), - DoneAsIs => match expr.map_ref_simple(ExprF::roll) { - e => e.map_ref( - SubExpr::clone, - |_, e| e.clone(), - X::clone, - |_| unreachable!(), - Label::clone, - ), - }, + DoneAsIs => expr.map_ref_simple(ExprF::roll).map_ref( + SubExpr::clone, + X::clone, + |_| unreachable!(), + Label::clone, + ), } } |