From bfe3f7f75570540fa184a133653d16e86f22667a Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 31 Mar 2019 18:47:57 +0200 Subject: rustfmt --- dhall/tests/dhall_type.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'dhall/tests') diff --git a/dhall/tests/dhall_type.rs b/dhall/tests/dhall_type.rs index faece20..941e3a4 100644 --- a/dhall/tests/dhall_type.rs +++ b/dhall/tests/dhall_type.rs @@ -33,10 +33,7 @@ fn test_dhall_type() { #[derive(Type)] #[allow(dead_code)] struct C(T, Option); - assert_eq!( - >::get_type(), - <(bool, Option)>::get_type() - ); + assert_eq!(>::get_type(), <(bool, Option)>::get_type()); #[derive(Type)] #[allow(dead_code)] -- cgit v1.2.3 From 7374d0524ccd53b256107667b213597c05720d2d Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 31 Mar 2019 19:08:08 +0200 Subject: Move recursion out of Expr --- dhall/tests/common/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dhall/tests') diff --git a/dhall/tests/common/mod.rs b/dhall/tests/common/mod.rs index 6b893e0..325b80f 100644 --- a/dhall/tests/common/mod.rs +++ b/dhall/tests/common/mod.rs @@ -111,7 +111,7 @@ pub fn run_test(base_path: &str, feature: Feature) { let expected_file_path = base_path + "B.dhall"; let expr = rc(read_dhall_file(&expr_file_path).unwrap()); let expected = rc(read_dhall_file(&expected_file_path).unwrap()); - typecheck::type_of(rc(Expr::Annot(expr, expected))).unwrap(); + typecheck::type_of(rc(ExprF::Annot(expr, expected))).unwrap(); } } } -- cgit v1.2.3 From ce7358f7477b968df34fabe39e237b953148ea79 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/tests') 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