From 20be0a856a8e317418b6674262baa05653f79832 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 27 Dec 2019 13:51:02 +0000
Subject: Update dhall-lang submodule

---
 dhall-lang                                                |  2 +-
 dhall/build.rs                                            | 13 -------------
 dhall/src/syntax/text/parser.rs                           | 15 +++++++--------
 .../unit/FunctionApplicationArgumentNotMatch.txt          |  2 +-
 .../unit/MergeHandlerNotMatchAlternativeType.txt          |  2 +-
 5 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/dhall-lang b/dhall-lang
index 0c99dc6..e2d08eb 160000
--- a/dhall-lang
+++ b/dhall-lang
@@ -1 +1 @@
-Subproject commit 0c99dc6f53919fc2df6b965877c355b62cf6ba02
+Subproject commit e2d08ebf5fb5770b57d0681131bed4289d0bb623
diff --git a/dhall/build.rs b/dhall/build.rs
index b88c71f..c95a26d 100644
--- a/dhall/build.rs
+++ b/dhall/build.rs
@@ -128,8 +128,6 @@ fn generate_tests() -> std::io::Result<()> {
                     || path == "unit/import/urls/emptyPath0"
                     || path == "unit/import/urls/emptyPath1"
                     || path == "unit/import/urls/emptyPathSegment"
-                    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
-                    || path == "preferMissingNoSpaces"
             }),
             input_type: FileType::Text,
             output_type: Some(FileType::Binary),
@@ -154,8 +152,6 @@ fn generate_tests() -> std::io::Result<()> {
                     || path == "unit/import/urls/emptyPath0"
                     || path == "unit/import/urls/emptyPath1"
                     || path == "unit/import/urls/emptyPathSegment"
-                    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
-                    || path == "preferMissingNoSpaces"
             }),
             input_type: FileType::Text,
             output_type: Some(FileType::Binary),
@@ -178,8 +174,6 @@ fn generate_tests() -> std::io::Result<()> {
                     || path == "unit/import/urls/emptyPath0"
                     || path == "unit/import/urls/emptyPath1"
                     || path == "unit/import/urls/emptyPathSegment"
-                    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
-                    || path == "preferMissingNoSpaces"
             }),
             input_type: FileType::Text,
             output_type: Some(FileType::Binary),
@@ -282,10 +276,6 @@ fn generate_tests() -> std::io::Result<()> {
                     // TODO: record completion
                     || path == "simple/completion"
                     || path == "unit/Completion"
-                    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
-                    || path == "unit/MergeNone"
-                    || path == "unit/MergeSome"
-                    || path == "unit/NaturalBuildFoldFusion"
             }),
             input_type: FileType::Text,
             output_type: Some(FileType::Text),
@@ -321,9 +311,6 @@ fn generate_tests() -> std::io::Result<()> {
                     // TODO: record completion
                     || path == "simple/completion"
                     || path == "unit/Completion"
-                    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
-                    || path == "unit/MergeNone"
-                    || path == "unit/MergeSome"
             }),
             input_type: FileType::Text,
             output_type: Some(FileType::Text),
diff --git a/dhall/src/syntax/text/parser.rs b/dhall/src/syntax/text/parser.rs
index feaa2a5..ef1471f 100644
--- a/dhall/src/syntax/text/parser.rs
+++ b/dhall/src/syntax/text/parser.rs
@@ -183,14 +183,13 @@ impl DhallParser {
         Ok(Label::from(input.as_str()))
     }
 
-    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
-    // #[alias(label)]
-    // fn any_label_or_some(input: ParseInput) -> ParseResult<Label> {
-    //     Ok(match_nodes!(input.into_children();
-    //         [label(l)] => l,
-    //         [Some_(_)] => Label::from("Some"),
-    //     ))
-    // }
+    #[alias(label)]
+    fn any_label_or_some(input: ParseInput) -> ParseResult<Label> {
+        Ok(match_nodes!(input.into_children();
+            [label(l)] => l,
+            [Some_(_)] => Label::from("Some"),
+        ))
+    }
 
     fn double_quote_literal(input: ParseInput) -> ParseResult<ParsedText> {
         Ok(match_nodes!(input.into_children();
diff --git a/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt b/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt
index d3b1f50..3bb1492 100644
--- a/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt
+++ b/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt
@@ -10,4 +10,4 @@
 1 | (λ(_ : Natural) → _) True␊
   |        ^-----^
   |
-  = But the function expected an argument of type Value@WHNF { value: AppliedBuiltin(Natural, []), type: Type }
+  = But the function expected an argument of type Value@NF { value: AppliedBuiltin(Natural, []), type: Type }
diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
index 3f6c6a6..ae36eef 100644
--- a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
+++ b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
@@ -10,4 +10,4 @@
 1 | merge { x = λ(_ : Bool) → _ } (< x : Natural >.x 1)␊
   |                   ^--^
   |
-  = But the function expected an argument of type Value@WHNF { value: AppliedBuiltin(Bool, []), type: Type }
+  = But the function expected an argument of type Value@NF { value: AppliedBuiltin(Bool, []), type: Type }
-- 
cgit v1.2.3