Remove extra types stored in Value

2 files changed, 14 insertions, 25 deletions

diff --git a/dhall/src/semantics/nze/normalize.rs b/dhall/src/semantics/nze/normalize.rs
index acb2e51..981d894 100644
--- a/dhall/src/semantics/nze/normalize.rs
+++ b/dhall/src/semantics/nze/normalize.rs
@@ -13,16 +13,10 @@ pub(crate) fn apply_any(f: Value, a: Value) -> ValueKind {
         ValueKind::LamClosure { closure, .. } => {
             closure.apply(a).kind().clone()
         }
-        ValueKind::AppliedBuiltin(closure) => {
-            closure.apply(a, f.get_type_not_sort())
+        ValueKind::AppliedBuiltin(closure) => closure.apply(a),
+        ValueKind::UnionConstructor(l, kts) => {
+            ValueKind::UnionLit(l.clone(), a, kts.clone())
         }
-        ValueKind::UnionConstructor(l, kts, uniont) => ValueKind::UnionLit(
-            l.clone(),
-            a,
-            kts.clone(),
-            uniont.clone(),
-            f.get_type_not_sort(),
-        ),
         _ => ValueKind::PartialExpr(ExprKind::App(f, a)),
     }
 }
@@ -326,11 +320,9 @@ pub(crate) fn normalize_one_layer(
                 Some(r) => Ret::Value(r.clone()),
                 None => Ret::Expr(expr),
             },
-            UnionType(kts) => Ret::ValueKind(UnionConstructor(
-                l.clone(),
-                kts.clone(),
-                v.get_type_not_sort(),
-            )),
+            UnionType(kts) => {
+                Ret::ValueKind(UnionConstructor(l.clone(), kts.clone()))
+            }
             PartialExpr(ExprKind::BinOp(
                 BinOp::RightBiasedRecordMerge,
                 x,
@@ -402,11 +394,11 @@ pub(crate) fn normalize_one_layer(
         ExprKind::Merge(ref handlers, ref variant, _) => {
             match handlers.kind() {
                 RecordLit(kvs) => match variant.kind() {
-                    UnionConstructor(l, _, _) => match kvs.get(l) {
+                    UnionConstructor(l, _) => match kvs.get(l) {
                         Some(h) => Ret::Value(h.clone()),
                         None => Ret::Expr(expr),
                     },
-                    UnionLit(l, v, _, _, _) => match kvs.get(l) {
+                    UnionLit(l, v, _) => match kvs.get(l) {
                         Some(h) => Ret::Value(h.app(v.clone())),
                         None => Ret::Expr(expr),
                     },
diff --git a/dhall/src/semantics/nze/value.rs b/dhall/src/semantics/nze/value.rs
index d05c545..a771b91 100644
--- a/dhall/src/semantics/nze/value.rs
+++ b/dhall/src/semantics/nze/value.rs
@@ -93,10 +93,8 @@ pub(crate) enum ValueKind {
     RecordType(HashMap<Label, Value>),
     RecordLit(HashMap<Label, Value>),
     UnionType(HashMap<Label, Option<Value>>),
-    // Also keep the type of the uniontype around
-    UnionConstructor(Label, HashMap<Label, Option<Value>>, Value),
-    // Also keep the type of the uniontype and the constructor around
-    UnionLit(Label, Value, HashMap<Label, Option<Value>>, Value, Value),
+    UnionConstructor(Label, HashMap<Label, Option<Value>>),
+    UnionLit(Label, Value, HashMap<Label, Option<Value>>),
     TextLit(TextLit),
     Equivalence(Value, Value),
     /// Invariant: evaluation must not be able to progress with `normalize_one_layer`?
@@ -298,14 +296,14 @@ impl Value {
                         .collect(),
                 ),
                 ValueKind::UnionType(kts) => map_uniontype(kts),
-                ValueKind::UnionConstructor(l, kts, t) => ExprKind::Field(
+                ValueKind::UnionConstructor(l, kts) => ExprKind::Field(
                     Hir::new(
                         HirKind::Expr(map_uniontype(kts)),
                         Span::Artificial,
                     ),
                     l.clone(),
                 ),
-                ValueKind::UnionLit(l, v, kts, uniont, ctort) => ExprKind::App(
+                ValueKind::UnionLit(l, v, kts) => ExprKind::App(
                     Hir::new(
                         HirKind::Expr(ExprKind::Field(
                             Hir::new(
@@ -418,13 +416,12 @@ impl ValueKind {
                     x.normalize();
                 }
             }
-            ValueKind::UnionType(kts)
-            | ValueKind::UnionConstructor(_, kts, _) => {
+            ValueKind::UnionType(kts) | ValueKind::UnionConstructor(_, kts) => {
                 for x in kts.values().flat_map(|opt| opt) {
                     x.normalize();
                 }
             }
-            ValueKind::UnionLit(_, v, kts, _, _) => {
+            ValueKind::UnionLit(_, v, kts) => {
                 v.normalize();
                 for x in kts.values().flat_map(|opt| opt) {
                     x.normalize();