From dc725d7d6c30227b1f22ae098c224ffe49bc21d6 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 20 Sep 2019 22:09:22 +0200
Subject: Update dhall-lang submodule

---
 dhall-lang     |  2 +-
 dhall/build.rs | 52 +++++++++++++---------------------------------------
 2 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/dhall-lang b/dhall-lang
index 7639b4e..10671c8 160000
--- a/dhall-lang
+++ b/dhall-lang
@@ -1 +1 @@
-Subproject commit 7639b4ed2fd457bfa77daabfd329fea3b25581c9
+Subproject commit 10671c80af436cfe8719863be920894853e5e8f5
diff --git a/dhall/build.rs b/dhall/build.rs
index 757eed8..384de53 100644
--- a/dhall/build.rs
+++ b/dhall/build.rs
@@ -298,13 +298,20 @@ fn main() -> std::io::Result<()> {
     make_test_module(
         &mut file,
         TestFeature {
-            module_name: "typecheck_success",
-            directory: spec_tests_dir.join("typecheck/success/"),
-            variant: "TypecheckSuccess",
+            module_name: "type_inference_success",
+            directory: spec_tests_dir.join("type-inference/success/"),
+            variant: "TypeInferenceSuccess",
             path_filter: |path: &str| {
                 false
                     // Too slow
                     || path == "prelude"
+                    // TODO: projection by expression
+                    || path == "unit/RecordProjectionByType"
+                    || path == "unit/RecordProjectionByTypeEmpty"
+                    || path == "unit/RecordProjectionByTypeJudgmentalEquality"
+                    // TODO: toMap
+                    || path == "unit/ToMap"
+                    || path == "unit/ToMapAnnotated"
             },
             input_type: FileType::Text,
             output_type: Some(FileType::Text),
@@ -314,9 +321,9 @@ fn main() -> std::io::Result<()> {
     make_test_module(
         &mut file,
         TestFeature {
-            module_name: "typecheck_failure",
-            directory: spec_tests_dir.join("typecheck/failure/"),
-            variant: "TypecheckFailure",
+            module_name: "type_inference_failure",
+            directory: spec_tests_dir.join("type-inference/failure/"),
+            variant: "TypeInferenceFailure",
             path_filter: |path: &str| {
                 false
                     // TODO: Enable imports in typecheck tests
@@ -339,38 +346,5 @@ fn main() -> std::io::Result<()> {
         },
     )?;
 
-    make_test_module(
-        &mut file,
-        TestFeature {
-            module_name: "type_inference_success",
-            directory: spec_tests_dir.join("type-inference/success/"),
-            variant: "TypeInferenceSuccess",
-            path_filter: |path: &str| {
-                false
-                    // TODO: projection by expression
-                    || path == "unit/RecordProjectionByType"
-                    || path == "unit/RecordProjectionByTypeEmpty"
-                    || path == "unit/RecordProjectionByTypeJudgmentalEquality"
-                    // TODO: toMap
-                    || path == "unit/ToMap"
-                    || path == "unit/ToMapAnnotated"
-            },
-            input_type: FileType::Text,
-            output_type: Some(FileType::Text),
-        },
-    )?;
-
-    make_test_module(
-        &mut file,
-        TestFeature {
-            module_name: "type_inference_failure",
-            directory: spec_tests_dir.join("type-inference/failure/"),
-            variant: "TypeInferenceFailure",
-            path_filter: |_path: &str| false,
-            input_type: FileType::Text,
-            output_type: None,
-        },
-    )?;
-
     Ok(())
 }
-- 
cgit v1.2.3