From 7336787af41adc4dfe650f7c7f10f9c7c3c011db Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 4 Apr 2019 15:41:17 +0200
Subject: Update dhall-lang submodule

---
 dhall/tests/typecheck.rs | 72 ++++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'dhall')

diff --git a/dhall/tests/typecheck.rs b/dhall/tests/typecheck.rs
index 875b14a..0cd6ddf 100644
--- a/dhall/tests/typecheck.rs
+++ b/dhall/tests/typecheck.rs
@@ -80,17 +80,17 @@ tc_success!(spec_typecheck_success_prelude_List_shifted_0, "prelude/List/shifted
 tc_success!(spec_typecheck_success_prelude_List_shifted_1, "prelude/List/shifted/1");
 tc_success!(spec_typecheck_success_prelude_List_unzip_0, "prelude/List/unzip/0");
 tc_success!(spec_typecheck_success_prelude_List_unzip_1, "prelude/List/unzip/1");
-// tc_success!(spec_typecheck_success_prelude_Monoid_00, "prelude/Monoid/00");
-// tc_success!(spec_typecheck_success_prelude_Monoid_01, "prelude/Monoid/01");
-// tc_success!(spec_typecheck_success_prelude_Monoid_02, "prelude/Monoid/02");
-// tc_success!(spec_typecheck_success_prelude_Monoid_03, "prelude/Monoid/03");
-// tc_success!(spec_typecheck_success_prelude_Monoid_04, "prelude/Monoid/04");
-// tc_success!(spec_typecheck_success_prelude_Monoid_05, "prelude/Monoid/05");
-// tc_success!(spec_typecheck_success_prelude_Monoid_06, "prelude/Monoid/06");
-// tc_success!(spec_typecheck_success_prelude_Monoid_07, "prelude/Monoid/07");
-// tc_success!(spec_typecheck_success_prelude_Monoid_08, "prelude/Monoid/08");
-// tc_success!(spec_typecheck_success_prelude_Monoid_09, "prelude/Monoid/09");
-// tc_success!(spec_typecheck_success_prelude_Monoid_10, "prelude/Monoid/10");
+tc_success!(spec_typecheck_success_prelude_Monoid_00, "prelude/Monoid/00");
+tc_success!(spec_typecheck_success_prelude_Monoid_01, "prelude/Monoid/01");
+tc_success!(spec_typecheck_success_prelude_Monoid_02, "prelude/Monoid/02");
+tc_success!(spec_typecheck_success_prelude_Monoid_03, "prelude/Monoid/03");
+tc_success!(spec_typecheck_success_prelude_Monoid_04, "prelude/Monoid/04");
+tc_success!(spec_typecheck_success_prelude_Monoid_05, "prelude/Monoid/05");
+tc_success!(spec_typecheck_success_prelude_Monoid_06, "prelude/Monoid/06");
+tc_success!(spec_typecheck_success_prelude_Monoid_07, "prelude/Monoid/07");
+tc_success!(spec_typecheck_success_prelude_Monoid_08, "prelude/Monoid/08");
+tc_success!(spec_typecheck_success_prelude_Monoid_09, "prelude/Monoid/09");
+tc_success!(spec_typecheck_success_prelude_Monoid_10, "prelude/Monoid/10");
 tc_success!(spec_typecheck_success_prelude_Natural_build_0, "prelude/Natural/build/0");
 tc_success!(spec_typecheck_success_prelude_Natural_build_1, "prelude/Natural/build/1");
 tc_success!(spec_typecheck_success_prelude_Natural_enumerate_0, "prelude/Natural/enumerate/0");
@@ -114,35 +114,35 @@ tc_success!(spec_typecheck_success_prelude_Natural_sum_1, "prelude/Natural/sum/1
 // tc_success!(spec_typecheck_success_prelude_Natural_toDouble_1, "prelude/Natural/toDouble/1");
 // tc_success!(spec_typecheck_success_prelude_Natural_toInteger_0, "prelude/Natural/toInteger/0");
 // tc_success!(spec_typecheck_success_prelude_Natural_toInteger_1, "prelude/Natural/toInteger/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_all_0, "prelude/Optional/all/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_all_1, "prelude/Optional/all/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_any_0, "prelude/Optional/any/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_any_1, "prelude/Optional/any/1");
+tc_success!(spec_typecheck_success_prelude_Optional_all_0, "prelude/Optional/all/0");
+tc_success!(spec_typecheck_success_prelude_Optional_all_1, "prelude/Optional/all/1");
+tc_success!(spec_typecheck_success_prelude_Optional_any_0, "prelude/Optional/any/0");
+tc_success!(spec_typecheck_success_prelude_Optional_any_1, "prelude/Optional/any/1");
 // tc_success!(spec_typecheck_success_prelude_Optional_build_0, "prelude/Optional/build/0");
 // tc_success!(spec_typecheck_success_prelude_Optional_build_1, "prelude/Optional/build/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_concat_0, "prelude/Optional/concat/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_concat_1, "prelude/Optional/concat/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_concat_2, "prelude/Optional/concat/2");
+tc_success!(spec_typecheck_success_prelude_Optional_concat_0, "prelude/Optional/concat/0");
+tc_success!(spec_typecheck_success_prelude_Optional_concat_1, "prelude/Optional/concat/1");
+tc_success!(spec_typecheck_success_prelude_Optional_concat_2, "prelude/Optional/concat/2");
 // tc_success!(spec_typecheck_success_prelude_Optional_filter_0, "prelude/Optional/filter/0");
 // tc_success!(spec_typecheck_success_prelude_Optional_filter_1, "prelude/Optional/filter/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_fold_0, "prelude/Optional/fold/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_fold_1, "prelude/Optional/fold/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_head_0, "prelude/Optional/head/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_head_1, "prelude/Optional/head/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_head_2, "prelude/Optional/head/2");
-// tc_success!(spec_typecheck_success_prelude_Optional_last_0, "prelude/Optional/last/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_last_1, "prelude/Optional/last/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_last_2, "prelude/Optional/last/2");
-// tc_success!(spec_typecheck_success_prelude_Optional_length_0, "prelude/Optional/length/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_length_1, "prelude/Optional/length/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_map_0, "prelude/Optional/map/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_map_1, "prelude/Optional/map/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_null_0, "prelude/Optional/null/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_null_1, "prelude/Optional/null/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_toList_0, "prelude/Optional/toList/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_toList_1, "prelude/Optional/toList/1");
-// tc_success!(spec_typecheck_success_prelude_Optional_unzip_0, "prelude/Optional/unzip/0");
-// tc_success!(spec_typecheck_success_prelude_Optional_unzip_1, "prelude/Optional/unzip/1");
+tc_success!(spec_typecheck_success_prelude_Optional_fold_0, "prelude/Optional/fold/0");
+tc_success!(spec_typecheck_success_prelude_Optional_fold_1, "prelude/Optional/fold/1");
+tc_success!(spec_typecheck_success_prelude_Optional_head_0, "prelude/Optional/head/0");
+tc_success!(spec_typecheck_success_prelude_Optional_head_1, "prelude/Optional/head/1");
+tc_success!(spec_typecheck_success_prelude_Optional_head_2, "prelude/Optional/head/2");
+tc_success!(spec_typecheck_success_prelude_Optional_last_0, "prelude/Optional/last/0");
+tc_success!(spec_typecheck_success_prelude_Optional_last_1, "prelude/Optional/last/1");
+tc_success!(spec_typecheck_success_prelude_Optional_last_2, "prelude/Optional/last/2");
+tc_success!(spec_typecheck_success_prelude_Optional_length_0, "prelude/Optional/length/0");
+tc_success!(spec_typecheck_success_prelude_Optional_length_1, "prelude/Optional/length/1");
+tc_success!(spec_typecheck_success_prelude_Optional_map_0, "prelude/Optional/map/0");
+tc_success!(spec_typecheck_success_prelude_Optional_map_1, "prelude/Optional/map/1");
+tc_success!(spec_typecheck_success_prelude_Optional_null_0, "prelude/Optional/null/0");
+tc_success!(spec_typecheck_success_prelude_Optional_null_1, "prelude/Optional/null/1");
+tc_success!(spec_typecheck_success_prelude_Optional_toList_0, "prelude/Optional/toList/0");
+tc_success!(spec_typecheck_success_prelude_Optional_toList_1, "prelude/Optional/toList/1");
+tc_success!(spec_typecheck_success_prelude_Optional_unzip_0, "prelude/Optional/unzip/0");
+tc_success!(spec_typecheck_success_prelude_Optional_unzip_1, "prelude/Optional/unzip/1");
 tc_success!(spec_typecheck_success_prelude_Text_concat_0, "prelude/Text/concat/0");
 tc_success!(spec_typecheck_success_prelude_Text_concat_1, "prelude/Text/concat/1");
 tc_success!(spec_typecheck_success_prelude_Text_concatMap_0, "prelude/Text/concatMap/0");
-- 
cgit v1.2.3


From 3e4b2dcb8c371045737901c0d49f9d9403109ea0 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 4 Apr 2019 21:43:41 +0200
Subject: Get keyword rule from upstream

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

(limited to 'dhall')

diff --git a/dhall/src/normalize.rs b/dhall/src/normalize.rs
index a3a2318..d9bd08a 100644
--- a/dhall/src/normalize.rs
+++ b/dhall/src/normalize.rs
@@ -107,7 +107,7 @@ where
                 break dhall_expr!(
                     g
                     (List a0)
-                    (λ(a : a0) -> λ(as : List a1) -> [ a ] # as)
+                    (λ(x : a0) -> λ(xs : List a1) -> [ x ] # xs)
                     ([] : List a0)
                 );
             }
-- 
cgit v1.2.3


From f78af6d1e7f6c1dc39bde6cf97138327004ddb06 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 5 Apr 2019 00:09:07 +0200
Subject: Update dhall-lang submodule

---
 dhall/build.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'dhall')

diff --git a/dhall/build.rs b/dhall/build.rs
index f7a31c0..e80115f 100644
--- a/dhall/build.rs
+++ b/dhall/build.rs
@@ -23,6 +23,7 @@ fn dhall_files_in_dir<'a>(dir: &'a Path) -> impl Iterator<Item = String> + 'a {
 
 fn main() -> std::io::Result<()> {
     println!("cargo:rerun-if-changed=../dhall-lang/.git");
+    println!("cargo:rerun-if-changed=../.git/modules/dhall-lang/refs/heads/master");
     let out_dir = env::var("OUT_DIR").unwrap();
     let tests_dir = Path::new("../dhall-lang/tests/");
 
-- 
cgit v1.2.3


From 305a2ee7dcd3b3f61bf6877312e3c34767e8bc0c Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 5 Apr 2019 22:41:55 +0200
Subject: Remove some unused files

---
 dhall/compare.fish | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100755 dhall/compare.fish

(limited to 'dhall')

diff --git a/dhall/compare.fish b/dhall/compare.fish
deleted file mode 100755
index 154f06a..0000000
--- a/dhall/compare.fish
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env fish
-
-set dhall_hs_path ../dhall
-set dhall_hs $dhall_hs_path/.stack-work/install/**/bin/dhall
-set dhall_rs target/debug/dhall
-set input_file $argv[1]
-diff -u \
-    --label "dhall-hs < $input_file" (eval $dhall_hs < $input_file ^&1 | psub) \
-    --label "dhall-rs < $input_file" (eval $dhall_rs < $input_file ^&1 | psub)
-- 
cgit v1.2.3