Update outputs

We now print less kind information in error messages

testsuite/tests/gadt/gadt10.stderr

 
 gadt10.hs:6:24:
-    `RInt' is not applied to enough type arguments
-    Expected kind `ArgKind', but `RInt' has kind `k0 -> *'
+    Expecting one more argument to `RInt'
     In the type `RInt'
     In the definition of data constructor `R'
     In the data type declaration for `RInt'

testsuite/tests/generics/all.T

@@ -2,6 +2,7 @@ setTestOpts(only_compiler_types(['ghc']))
 
 test('GenCanDoRep0',    normal, compile, [''])
 test('GenDerivOutput',  normal, compile, ['-dsuppress-uniques'])
+test('GenBigTypes',     normal, compile, [''])
 
 test('GenShouldFail0',  normal, compile_fail, [''])
 test('GenCannotDoRep0', normal, compile_fail, [''])

testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr

 
 SimpleFail14.hs:5:15:
     Predicate `a ~ a' used as a type
-    Expected kind `ArgKind', but `a ~ a' has kind `Constraint'
     In the type `a ~ a'
     In the definition of data constructor `T'
     In the data type declaration for `T'

testsuite/tests/polykinds/PolyKinds04.stderr

 
 PolyKinds04.hs:5:16:
-    `Maybe' is not applied to enough type arguments
-    The first argument of `A' should have kind `*',
-    but `Maybe' has kind `* -> *'
+    Expecting one more argument to `Maybe'
     In the type `A Maybe'
     In the definition of data constructor `B1'
     In the data type declaration for `B'

testsuite/tests/typecheck/should_compile/tc167.stderr

 
 tc167.hs:8:11:
     Expecting a lifted type, but `Int#' is unlifted
-    The first argument of `(->)' should have kind `*',
-    but `Int#' has kind `#'
     In the type signature for `f': f :: (->) Int# Int#

testsuite/tests/typecheck/should_fail/AssocTyDef04.stderr

 
 AssocTyDef04.hs:6:18:
-    `Maybe' is not applied to enough type arguments
-    Expected kind `*', but `Maybe' has kind `* -> *'
+    Expecting one more argument to `Maybe'
     In the type `Maybe'
     In the type synonym instance default declaration for `Typ'
     In the class declaration for `Cls'

testsuite/tests/typecheck/should_fail/T2994.stderr

 
 T2994.hs:11:10:
-    `MonadReader Int' is not applied to enough type arguments
-    Expected kind `Constraint',
-    but `MonadReader Int' has kind `* -> Constraint'
+    Expecting one more argument to `MonadReader Int'
     In the instance declaration for `MonadReader Int'
 
 T2994.hs:13:23:
-    `Reader' r' is not applied to enough type arguments
-    The first argument of `MonadReader' should have kind `*',
-    but `Reader' r' has kind `* -> *'
+    Expecting one more argument to `Reader' r'
     In the instance declaration for `MonadReader (Reader' r)'
 
 T2994.hs:15:10:

testsuite/tests/typecheck/should_fail/T3540.stderr

 
 T3540.hs:4:12:
     Predicate `a ~ Int' used as a type
-    Expected kind `ArgKind', but `a ~ Int' has kind `Constraint'
     In the type signature for `thing': thing :: a ~ Int
 
 T3540.hs:7:20:
     Predicate `a ~ Int' used as a type
-    Expected kind `OpenKind', but `a ~ Int' has kind `Constraint'
     In the type signature for `thing1': thing1 :: Int -> (a ~ Int)
 
 T3540.hs:10:13:
     Predicate `a ~ Int' used as a type
-    Expected kind `ArgKind', but `a ~ Int' has kind `Constraint'
     In the type signature for `thing2': thing2 :: (a ~ Int) -> Int
 
 T3540.hs:13:12:
     Predicate `?dude :: Int' used as a type
-    Expected kind `ArgKind', but `?dude :: Int' has kind `Constraint'
     In the type signature for `thing3': thing3 :: (?dude :: Int) -> Int
 
 T3540.hs:16:11:
     Predicate `Eq a' used as a type
-    Expected kind `ArgKind', but `Eq a' has kind `Constraint'
     In the type signature for `thing4': thing4 :: (Eq a) -> Int

testsuite/tests/typecheck/should_fail/all.T

@@ -145,7 +145,7 @@ test('tcfail154', normal, compile_fail, [''])
 test('tcfail155', normal, compile_fail, [''])
 test('tcfail156', normal, compile_fail, [''])
 test('tcfail157', normal, compile_fail, [''])
-test('tcfail158', expect_fail, compile_fail, [''])
+test('tcfail158', normal, compile_fail, [''])
 test('tcfail159', normal, compile_fail, [''])
 test('tcfail160', normal, compile_fail, [''])
 test('tcfail161', normal, compile_fail, [''])

testsuite/tests/typecheck/should_fail/tcfail028.stderr

 
 tcfail028.hs:4:17:
-    `A a' is not applied to enough type arguments
-    Expected kind `ArgKind', but `A a' has kind `k0 -> *'
+    Expecting one more argument to `A a'
     In the type `A a'
     In the definition of data constructor `B'
     In the data type declaration for `A'

testsuite/tests/typecheck/should_fail/tcfail036.stderr

@@ -5,7 +5,5 @@ tcfail036.hs:6:10:
       instance Num NUM -- Defined at tcfail036.hs:8:10
 
 tcfail036.hs:9:13:
-    `Num' is not applied to enough type arguments
-    The first argument of `Eq' should have kind `*',
-    but `Num' has kind `* -> Constraint'
+    Expecting one more argument to `Num'
     In the instance declaration for `Eq Num'

testsuite/tests/typecheck/should_fail/tcfail057.stderr

 
 tcfail057.hs:5:7:
     Predicate `RealFrac a' used as a type
-    Expected kind `ArgKind', but `RealFrac a' has kind `Constraint'
     In the type signature for `f': f :: (RealFrac a) -> a -> a

testsuite/tests/typecheck/should_fail/tcfail058.stderr

 
 tcfail058.hs:6:7:
-    `Array a' is not applied to enough type arguments
-    Expected kind `Constraint', but `Array a' has kind `* -> *'
+    Expecting one more argument to `Array a'
     In the type signature for `f': f :: Array a => a -> b

testsuite/tests/typecheck/should_fail/tcfail063.stderr

 
 tcfail063.hs:6:9:
-    `Num' is not applied to enough type arguments
-    Expected kind `Constraint', but `Num' has kind `* -> Constraint'
+    Expecting one more argument to `Num'
     In the type signature for `moby': moby :: Num => Int -> a -> Int

testsuite/tests/typecheck/should_fail/tcfail079.stderr

 
 tcfail079.hs:9:27:
     Expecting a lifted type, but `Int#' is unlifted
-    Expected kind `*', but `Int#' has kind `#'
     In the type `Int#'
     In the definition of data constructor `Unboxed'
     In the newtype declaration for `Unboxed'

testsuite/tests/typecheck/should_fail/tcfail110.stderr

 
 tcfail110.hs:8:30:
-    `Foo a' is not applied to enough type arguments
-    Expected kind `ArgKind', but `Foo a' has kind `* -> *'
+    Expecting one more argument to `Foo a'
     In the type signature for `bar':
       bar :: String -> (forall a. Foo a) -> IO ()

testsuite/tests/typecheck/should_fail/tcfail113.stderr

 
 tcfail113.hs:12:7:
-    `Maybe' is not applied to enough type arguments
-    Expected kind `*', but `Maybe' has kind `* -> *'
-    In the type signature for `f':
-      f :: [Maybe]
+    Expecting one more argument to `Maybe'
+    In the type signature for `f': f :: [Maybe]
 
 tcfail113.hs:15:8:
     Kind mis-match
     The first argument of `T' should have kind `* -> *',
     but `Int' has kind `*'
-    In the type signature for `g':
-      g :: T Int
+    In the type signature for `g': g :: T Int
 
 tcfail113.hs:18:6:
     `Int' is applied to too many type arguments
-    In the type signature for `h':
-      h :: Int Int
+    In the type signature for `h': h :: Int Int

testsuite/tests/typecheck/should_fail/tcfail134.stderr

 
 tcfail134.hs:5:33:
-    `XML' is not applied to enough type arguments
-    Expected kind `OpenKind', but `XML' has kind `* -> Constraint'
+    Expecting one more argument to `XML'
     In the type `a -> XML'
     In the class declaration for `XML'

testsuite/tests/typecheck/should_fail/tcfail135.stderr

 
 tcfail135.hs:6:23:
-    `f' is not applied to enough type arguments
-    Expected kind `OpenKind', but `f' has kind `k0 -> *'
+    Expecting one more argument to `f'
     In the type `f a -> f'
     In the class declaration for `Foo'

testsuite/tests/typecheck/should_fail/tcfail136.stderr

 
 tcfail136.hs:9:35:
-    `SymDict' is not applied to enough type arguments
-    Expected kind `ArgKind', but `SymDict' has kind `* -> *'
+    Expecting one more argument to `SymDict'
     In the type `SymDict'
     In the definition of data constructor `SymTable'
     In the data type declaration for `SymTable'

testsuite/tests/typecheck/should_fail/tcfail146.stderr

 
 tcfail146.hs:7:22:
     Predicate `SClass a' used as a type
-    Expected kind `ArgKind', but `SClass a' has kind `Constraint'
     In the type `SClass a'
     In the definition of data constructor `SCon'
     In the data type declaration for `SData'

testsuite/tests/typecheck/should_fail/tcfail147.stderr

 
 tcfail147.hs:7:19:
-    `XClass' is not applied to enough type arguments
-    Expected kind `ArgKind', but `XClass' has kind `k0 -> Constraint'
+    Expecting one more argument to `XClass'
     In the type `XClass'
     In the definition of data constructor `XCon'
     In the data type declaration for `XData'

testsuite/tests/typecheck/should_fail/tcfail148.stderr

 
 tcfail148.hs:5:28:
-    `List' is not applied to enough type arguments
-    Expected kind `ArgKind', but `List' has kind `* -> *'
+    Expecting one more argument to `List'
     In the type `List'
     In the definition of data constructor `Cons'
     In the data type declaration for `List'

testsuite/tests/typecheck/should_fail/tcfail151.stderr

@@ -3,6 +3,5 @@ tcfail151.hs:1:14:
     Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
 
 tcfail151.hs:8:6:
-    `Name a' is not applied to enough type arguments
-    Expected kind `Constraint', but `Name a' has kind `* -> Constraint'
+    Expecting one more argument to `Name a'
     In the data type declaration for `Exp'

testsuite/tests/typecheck/should_fail/tcfail158.stderr

 
 tcfail158.hs:14:19:
-    `Val v' is not applied to enough type arguments
-    Expected kind `*', but `Val v' has kind `* -> *'
-    In the type signature for `bar':
-      bar :: forall v. Val v
+    Expecting one more argument to `Val v'
+    In the type signature for `bar': bar :: forall v. Val v

testsuite/tests/typecheck/should_fail/tcfail161.stderr

 
 tcfail161.hs:5:7:
-    `Maybe' is not applied to enough type arguments
-    Expected kind `*', but `Maybe' has kind `* -> *'
-    In the type signature for `f':
-      f :: [Maybe]
+    Expecting one more argument to `Maybe'
+    In the type signature for `f': f :: [Maybe]

testsuite/tests/typecheck/should_fail/tcfail162.stderr

 
 tcfail162.hs:10:33:
-    `ForeignPtr' is not applied to enough type arguments
-    Expected kind `ArgKind', but `ForeignPtr' has kind `* -> *'
+    Expecting one more argument to `ForeignPtr'
     In the type `{-# UNPACK #-} !ForeignPtr'
     In the definition of data constructor `Foo'
     In the data type declaration for `Foo'

testsuite/tests/typecheck/should_fail/tcfail212.stderr

 
 tcfail212.hs:10:7:
-    `Maybe' is not applied to enough type arguments
-    The first argument of a tuple should have kind `*',
-    but `Maybe' has kind `* -> *'
+    Expecting one more argument to `Maybe'
     In the type signature for `f': f :: (Maybe, Either Int)
 
 tcfail212.hs:13:7:
     Expecting a lifted type, but `Int#' is unlifted
-    The first argument of a tuple should have kind `*',
-    but `Int#' has kind `#'
     In the type signature for `g': g :: (Int#, Int#)

testsuite/tests/typecheck/should_fail/tcfail215.stderr

 
 tcfail215.hs:8:15:
     Expecting a lifted type, but `Int#' is unlifted
-    The type argument of the implicit parameter had kind `*',
-    but `Int#' has kind `#'
     In the type signature for `foo': foo :: ?x :: Int# => Int