Enable comparing Closures for equality

1 files changed, 7 insertions, 4 deletions

diff --git a/dhall/src/semantics/phase/normalize.rs b/dhall/src/semantics/phase/normalize.rs
index 066a004..7f547d7 100644
--- a/dhall/src/semantics/phase/normalize.rs
+++ b/dhall/src/semantics/phase/normalize.rs
@@ -884,17 +884,20 @@ pub(crate) fn normalize_tyexpr_whnf(tye: &TyExpr, env: &NzEnv) -> Value {
     let kind = match tye.kind() {
         TyExprKind::Var(var) => return env.lookup_val(var),
         TyExprKind::Expr(ExprKind::Lam(binder, annot, body)) => {
+            let annot = annot.normalize_whnf(env);
             ValueKind::LamClosure {
                 binder: Binder::new(binder.clone()),
-                annot: annot.normalize_whnf(env),
-                closure: Closure::new(env, body.clone()),
+                annot: annot.clone(),
+                closure: Closure::new(annot, env, body.clone()),
             }
         }
         TyExprKind::Expr(ExprKind::Pi(binder, annot, body)) => {
+            let annot = annot.normalize_whnf(env);
+            let closure = Closure::new(annot.clone(), env, body.clone());
             ValueKind::PiClosure {
                 binder: Binder::new(binder.clone()),
-                annot: annot.normalize_whnf(env),
-                closure: Closure::new(env, body.clone()),
+                annot,
+                closure,
             }
         }
         TyExprKind::Expr(ExprKind::Let(_, None, val, body)) => {