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/build.rs | 52 +++++++++++++---------------------------------------
 1 file changed, 13 insertions(+), 39 deletions(-)

(limited to 'dhall')

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


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

---
 dhall/build.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'dhall')

diff --git a/dhall/build.rs b/dhall/build.rs
index 384de53..b7ed6ca 100644
--- a/dhall/build.rs
+++ b/dhall/build.rs
@@ -259,10 +259,11 @@ fn main() -> std::io::Result<()> {
                     || path == "unit/EmptyToMap"
                     || path == "unit/ToMap"
                     || path == "unit/ToMapWithType"
-                    // TODO: Normalize field selection further by inspecting the argument
+                    // TODO: Further record simplifications
                     || path == "simplifications/rightBiasedMergeWithinRecordProjectionWithinFieldSelection0"
                     || path == "simplifications/rightBiasedMergeWithinRecordProjectionWithinFieldSelection1"
                     || path == "simplifications/rightBiasedMergeWithinRecursiveRecordMergeWithinFieldselection"
+                    || path == "simplifications/issue661"
                     || path == "unit/RecordProjectionByTypeWithinFieldSelection"
                     || path == "unit/RecordProjectionWithinFieldSelection"
                     || path == "unit/RecursiveRecordMergeWithinFieldSelection0"
@@ -273,7 +274,10 @@ fn main() -> std::io::Result<()> {
                     || path == "unit/RightBiasedMergeWithinFieldSelection1"
                     || path == "unit/RightBiasedMergeWithinFieldSelection2"
                     || path == "unit/RightBiasedMergeWithinFieldSelection3"
+                    || path == "unit/RightBiasedRecordMergeWithinRecordProjection"
                     || path == "unit/RightBiasedMergeEquivalentArguments"
+                    || path == "unit/NestedRecordProjection"
+                    || path == "unit/NestedRecordProjectionByType"
             },
             input_type: FileType::Text,
             output_type: Some(FileType::Text),
@@ -312,6 +316,7 @@ fn main() -> std::io::Result<()> {
                     // TODO: toMap
                     || path == "unit/ToMap"
                     || path == "unit/ToMapAnnotated"
+                    || path == "simple/toMapEmptyNormalizeAnnotation"
             },
             input_type: FileType::Text,
             output_type: Some(FileType::Text),
@@ -340,6 +345,7 @@ fn main() -> std::io::Result<()> {
                     || path == "unit/MistypedToMap3"
                     || path == "unit/MistypedToMap4"
                     || path == "unit/NonRecordToMap"
+                    || path == "unit/ToMapWrongKind"
             },
             input_type: FileType::Text,
             output_type: None,
-- 
cgit v1.2.3