From d1f828961bccf9627ef4fb76ca528f039d180ff7 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 21 Apr 2019 11:30:58 +0200
Subject: Embrace TypeInternal as a semantic value

---
 dhall/src/tests.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dhall/src/tests.rs')

diff --git a/dhall/src/tests.rs b/dhall/src/tests.rs
index 7f85b5c..c945b23 100644
--- a/dhall/src/tests.rs
+++ b/dhall/src/tests.rs
@@ -140,7 +140,7 @@ pub fn run_test(
                 TypeInference => {
                     let expr = expr.typecheck()?;
                     let ty = expr.get_type()?;
-                    assert_eq_display!(ty.as_normalized()?.as_ref(), &expected);
+                    assert_eq_display!(ty.as_ref(), &expected.into_type());
                 }
                 Normalization => {
                     let expr = expr.skip_typecheck().normalize();
-- 
cgit v1.2.3


From 2f1fa26abd9c9f2b75d24b18877d3b278f7d2a01 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 23 Apr 2019 14:13:50 +0200
Subject: Avoid duplicating work when matching on Pi types

---
 dhall/src/tests.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'dhall/src/tests.rs')

diff --git a/dhall/src/tests.rs b/dhall/src/tests.rs
index c945b23..4d8fabd 100644
--- a/dhall/src/tests.rs
+++ b/dhall/src/tests.rs
@@ -71,7 +71,7 @@ pub fn run_test_with_bigger_stack(
 ) -> std::result::Result<(), String> {
     // Many tests stack overflow in debug mode
     let base_path: String = base_path.to_string();
-    stacker::grow(4 * 1024 * 1024, move || {
+    stacker::grow(6 * 1024 * 1024, move || {
         run_test(&base_path, feature, status)
             .map_err(|e| e.to_string())
             .map(|_| ())
@@ -135,12 +135,15 @@ pub fn run_test(
                     assert_eq_display!(expr, expected);
                 }
                 Typecheck => {
-                    expr.typecheck_with(&expected.into_type())?;
+                    expr.typecheck_with(&expected.into_type()?)?;
                 }
                 TypeInference => {
                     let expr = expr.typecheck()?;
                     let ty = expr.get_type()?;
-                    assert_eq_display!(ty.as_ref(), &expected.into_type());
+                    assert_eq_display!(
+                        ty.as_normalized()?.as_expr(),
+                        expected.into_type()?.as_normalized()?.as_expr()
+                    );
                 }
                 Normalization => {
                     let expr = expr.skip_typecheck().normalize();
-- 
cgit v1.2.3


From e2626a0bfd4b145e7d54c2150457f57e798ba2f7 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 30 Apr 2019 14:45:25 +0200
Subject: Store a Thunk in Typed

---
 dhall/src/tests.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'dhall/src/tests.rs')

diff --git a/dhall/src/tests.rs b/dhall/src/tests.rs
index 4d8fabd..ebca256 100644
--- a/dhall/src/tests.rs
+++ b/dhall/src/tests.rs
@@ -130,8 +130,7 @@ pub fn run_test(
             match feature {
                 Parser => unreachable!(),
                 Import => {
-                    // Not sure whether to normalize or not
-                    let expr = expr.skip_typecheck().skip_normalize();
+                    let expr = expr.skip_typecheck().normalize();
                     assert_eq_display!(expr, expected);
                 }
                 Typecheck => {
-- 
cgit v1.2.3


From db3ca819283f9bd99d197de464717f0b58b52fe4 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 2 May 2019 17:07:11 +0200
Subject: Instead of possibly nonexistent Type, treat Sort specially

---
 dhall/src/tests.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'dhall/src/tests.rs')

diff --git a/dhall/src/tests.rs b/dhall/src/tests.rs
index ebca256..ecd6e43 100644
--- a/dhall/src/tests.rs
+++ b/dhall/src/tests.rs
@@ -134,15 +134,12 @@ pub fn run_test(
                     assert_eq_display!(expr, expected);
                 }
                 Typecheck => {
-                    expr.typecheck_with(&expected.into_type()?)?;
+                    expr.typecheck_with(&expected.to_type())?;
                 }
                 TypeInference => {
                     let expr = expr.typecheck()?;
-                    let ty = expr.get_type()?;
-                    assert_eq_display!(
-                        ty.as_normalized()?.as_expr(),
-                        expected.into_type()?.as_normalized()?.as_expr()
-                    );
+                    let ty = expr.get_type()?.into_owned();
+                    assert_eq_display!(ty.to_normalized(), expected);
                 }
                 Normalization => {
                     let expr = expr.skip_typecheck().normalize();
-- 
cgit v1.2.3