Fix test suite in response to dhall-lang/dhall-lang#723

dhall/dhall.cabal

@@ -290,128 +290,69 @@ Extra-Source-Files:
     dhall-lang/tests/semantic-hash/success/simple/*.hash
     dhall-lang/tests/semantic-hash/success/simplifications/*.dhall
     dhall-lang/tests/semantic-hash/success/simplifications/*.hash
-    dhall-lang/tests/typecheck/data/*.dhall
-    dhall-lang/tests/typecheck/failure/*.dhall
-    dhall-lang/tests/typecheck/success/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/and/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/and/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/build/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/build/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/even/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/even/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/fold/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/fold/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/not/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/not/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/odd/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/odd/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/or/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/or/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/show/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Bool/show/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Double/show/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Double/show/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Integer/show/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Integer/show/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Integer/toDouble/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Integer/toDouble/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/all/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/all/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/any/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/any/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/build/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/build/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/concat/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/concat/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/concatMap/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/concatMap/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/filter/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/filter/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/fold/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/fold/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/generate/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/generate/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/head/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/head/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/indexed/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/indexed/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/iterate/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/iterate/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/last/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/last/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/length/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/length/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/map/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/map/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/null/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/null/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/replicate/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/replicate/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/reverse/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/reverse/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/shifted/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/shifted/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/unzip/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/List/unzip/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Monoid/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/build/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/build/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/enumerate/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/enumerate/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/even/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/even/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/fold/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/fold/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/isZero/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/isZero/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/odd/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/odd/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/product/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/product/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/show/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/show/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/sum/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/sum/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/toDouble/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/toDouble/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/toInteger/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Natural/toInteger/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/all/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/all/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/any/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/any/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/build/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/build/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/concat/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/concat/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/filter/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/filter/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/fold/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/fold/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/head/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/head/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/last/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/last/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/length/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/length/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/map/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/map/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/null/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/null/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/toList/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/toList/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/unzip/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Optional/unzip/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Text/concat/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Text/concat/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Text/concatMap/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Text/concatMap/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Text/concatMapSep/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Text/concatMapSep/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Text/concatSep/*.dhall
-    dhall-lang/tests/typecheck/success/prelude/Text/concatSep/*.dhall
-    dhall-lang/tests/typecheck/success/simple/access/*.dhall
-    dhall-lang/tests/typecheck/success/simple/*.dhall
+    dhall-lang/tests/type-inference/data/*.dhall
+    dhall-lang/tests/type-inference/failure/*.dhall
+    dhall-lang/tests/type-inference/success/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Bool/and/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Bool/build/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Bool/even/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Bool/fold/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Bool/not/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Bool/odd/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Bool/or/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Bool/show/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Double/show/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Integer/show/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Integer/toDouble/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/all/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/any/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/build/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/concat/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/concatMap/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/filter/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/fold/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/generate/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/head/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/indexed/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/iterate/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/last/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/length/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/map/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/null/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/replicate/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/reverse/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/shifted/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/List/unzip/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Monoid/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/build/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/enumerate/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/even/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/fold/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/isZero/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/odd/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/product/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/show/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/sum/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/toDouble/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Natural/toInteger/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/all/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/any/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/build/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/concat/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/filter/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/fold/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/head/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/last/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/length/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/map/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/null/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/toList/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Optional/unzip/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Text/concat/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Text/concatMap/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Text/concatMapSep/*.dhall
+    dhall-lang/tests/type-inference/success/prelude/Text/concatSep/*.dhall
+    dhall-lang/tests/type-inference/success/simple/access/*.dhall
     dhall-lang/tests/type-inference/success/simple/*.dhall
     dhall-lang/tests/type-inference/success/unit/*.dhall
     tests/format/*.dhall
@@ -585,7 +526,6 @@ Test-Suite tasty
         Dhall.Test.Regression
         Dhall.Test.SemanticHash
         Dhall.Test.Tutorial
-        Dhall.Test.TypeCheck
         Dhall.Test.TypeInference
         Dhall.Test.Util
     Build-Depends:

dhall/src/Dhall/Import.hs

@@ -108,7 +108,7 @@ module Dhall.Import (
     , hashExpressionToCode
     , writeExpressionToSemanticCache
     , assertNoImports
-    , Status
+    , Status(..)
     , SemanticCacheMode(..)
     , Chained
     , chainedImport

dhall/tests/Dhall/Test/Main.hs

@@ -14,7 +14,6 @@ import qualified Dhall.Test.Parser
 import qualified Dhall.Test.QuickCheck
 import qualified Dhall.Test.Regression
 import qualified Dhall.Test.Tutorial
-import qualified Dhall.Test.TypeCheck
 import qualified Dhall.Test.TypeInference
 import qualified GHC.IO.Encoding
 import qualified System.Directory
@@ -30,8 +29,6 @@ getAllTests = do
 
     formattingTests <- Dhall.Test.Format.getTests
 
-    typecheckingTests <- Dhall.Test.TypeCheck.getTests
-
     typeinferenceTests <- Dhall.Test.TypeInference.getTests
 
     importingTests <- Dhall.Test.Import.getTests
@@ -47,7 +44,6 @@ getAllTests = do
                 [ normalizationTests
                 , parsingTests
                 , importingTests
-                , typecheckingTests
                 , typeinferenceTests
                 , formattingTests
                 , lintTests