From 5a2538d174fd36a8ed7f4fa344b9583fc48bd977 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 11 Feb 2020 13:12:13 +0000
Subject: Remove the Embed variant from ExprKind

---
 dhall/src/semantics/tck/tyexpr.rs    | 3 +--
 dhall/src/semantics/tck/typecheck.rs | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'dhall/src/semantics/tck')

diff --git a/dhall/src/semantics/tck/tyexpr.rs b/dhall/src/semantics/tck/tyexpr.rs
index a1666a4..d46ab87 100644
--- a/dhall/src/semantics/tck/tyexpr.rs
+++ b/dhall/src/semantics/tck/tyexpr.rs
@@ -1,7 +1,6 @@
 use crate::error::{TypeError, TypeMessage};
 use crate::semantics::{AlphaVar, Hir, HirKind, NzEnv, Value};
 use crate::syntax::{ExprKind, Span};
-use crate::Normalized;
 use crate::{NormalizedExpr, ToExprOptions};
 
 pub(crate) type Type = Value;
@@ -10,7 +9,7 @@ pub(crate) type Type = Value;
 pub(crate) enum TyExprKind {
     Var(AlphaVar),
     // Forbidden ExprKind variants: Var, Import, Embed
-    Expr(ExprKind<TyExpr, Normalized>),
+    Expr(ExprKind<TyExpr>),
 }
 
 // An expression with inferred types at every node and resolved variables.
diff --git a/dhall/src/semantics/tck/typecheck.rs b/dhall/src/semantics/tck/typecheck.rs
index 4e45637..f9ff3d3 100644
--- a/dhall/src/semantics/tck/typecheck.rs
+++ b/dhall/src/semantics/tck/typecheck.rs
@@ -11,7 +11,6 @@ use crate::semantics::{
 use crate::syntax::{
     BinOp, Builtin, Const, ExprKind, InterpolatedTextContents, Span,
 };
-use crate::Normalized;
 
 fn type_of_recordtype<'a>(
     span: Span,
@@ -51,7 +50,7 @@ pub fn mkerr<T, S: ToString>(x: S) -> Result<T, TypeError> {
 /// layer.
 fn type_one_layer(
     env: &TyEnv,
-    ekind: ExprKind<TyExpr, Normalized>,
+    ekind: ExprKind<TyExpr>,
     span: Span,
 ) -> Result<TyExpr, TypeError> {
     let span_err = |msg: &str| {
@@ -66,9 +65,7 @@ fn type_one_layer(
         ExprKind::Import(..) => unreachable!(
             "There should remain no imports in a resolved expression"
         ),
-        ExprKind::Var(..)
-        | ExprKind::Const(Const::Sort)
-        | ExprKind::Embed(..) => unreachable!(), // Handled in type_with
+        ExprKind::Var(..) | ExprKind::Const(Const::Sort) => unreachable!(), // Handled in type_with
 
         ExprKind::Lam(binder, annot, body) => {
             let body_ty = body.get_type()?;
-- 
cgit v1.2.3