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/phase | |
| parent | 77af0bbc171618f48531cc6b1d77e18089928885 (diff) | |
Considerably simplify Embed handling
Diffstat (limited to 'dhall/src/phase')
| -rw-r--r-- | dhall/src/phase/normalize.rs | 1 | ||||
| -rw-r--r-- | dhall/src/phase/typecheck.rs | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/dhall/src/phase/normalize.rs b/dhall/src/phase/normalize.rs index f1045a5..2970f5f 100644 --- a/dhall/src/phase/normalize.rs +++ b/dhall/src/phase/normalize.rs @@ -381,7 +381,6 @@ pub fn normalize_whnf(ctx: NormalizationContext, expr: InputSubExpr) -> Value { expr.as_ref().map_ref_with_special_handling_of_binders( |e| Thunk::new(ctx.clone(), e.clone()), |x, e| Thunk::new(ctx.skip(x), e.clone()), - |_| unreachable!(), ); normalize_one_layer(expr) diff --git a/dhall/src/phase/typecheck.rs b/dhall/src/phase/typecheck.rs index 96ff246..e8b2544 100644 --- a/dhall/src/phase/typecheck.rs +++ b/dhall/src/phase/typecheck.rs @@ -376,12 +376,11 @@ fn type_with( e.as_ref().traverse_ref_with_special_handling_of_binders( |e| type_with(ctx, e.clone()), |_, _| unreachable!(), - |_| unreachable!(), )?; let ret = type_last_layer(ctx, &expr)?; match ret { RetTypeOnly(typ) => { - let expr = expr.map_ref_simple(|typed| typed.to_thunk()); + let expr = expr.map_ref(|typed| typed.to_thunk()); Typed::from_thunk_and_type( Thunk::from_partial_expr(expr), typ, |