diff options
author | Richard Eisenberg <eir@cis.upenn.edu> | 2014-08-08 08:14:52 -0400 |
---|---|---|
committer | Richard Eisenberg <eir@cis.upenn.edu> | 2014-08-12 11:46:21 -0400 |
commit | 91a48c5460258fdde800429df1e0d305cd2f0078 (patch) | |
tree | 9d78a5abcc1e2f90f0e3dd98dae11874009f27d5 /testsuite | |
parent | 1c66b3d5d3d5f5b58e1860c33233a049b11e3d92 (diff) | |
download | haskell-91a48c5460258fdde800429df1e0d305cd2f0078.tar.gz |
Testsuite wibbles around #9200
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/tests/ghci/scripts/T7939.hs | 4 | ||||
-rw-r--r-- | testsuite/tests/indexed-types/should_fail/ClosedFam3.hs-boot | 4 | ||||
-rw-r--r-- | testsuite/tests/polykinds/T7053.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/polykinds/T7053.stderr | 8 | ||||
-rw-r--r-- | testsuite/tests/polykinds/all.T | 2 |
5 files changed, 6 insertions, 14 deletions
diff --git a/testsuite/tests/ghci/scripts/T7939.hs b/testsuite/tests/ghci/scripts/T7939.hs index 93b90164c6..fbdf883b51 100644 --- a/testsuite/tests/ghci/scripts/T7939.hs +++ b/testsuite/tests/ghci/scripts/T7939.hs @@ -22,6 +22,6 @@ type family K a where K '[] = Nothing K (h ': t) = Just h -type family L (a :: k) b :: k where +type family L (a :: k) (b :: *) :: k where L Int Int = Bool - L Maybe Bool = IO
\ No newline at end of file + L Maybe Bool = IO diff --git a/testsuite/tests/indexed-types/should_fail/ClosedFam3.hs-boot b/testsuite/tests/indexed-types/should_fail/ClosedFam3.hs-boot index 0388084fa7..503e1adfd3 100644 --- a/testsuite/tests/indexed-types/should_fail/ClosedFam3.hs-boot +++ b/testsuite/tests/indexed-types/should_fail/ClosedFam3.hs-boot @@ -9,5 +9,5 @@ type family Bar a where Bar Int = Bool Bar Double = Char -type family Baz (a :: k) where - Baz Int = Bool
\ No newline at end of file +type family Baz (a :: k) :: * where + Baz Int = Bool diff --git a/testsuite/tests/polykinds/T7053.hs b/testsuite/tests/polykinds/T7053.hs index 4db1e0d7e9..d45dbadaee 100644 --- a/testsuite/tests/polykinds/T7053.hs +++ b/testsuite/tests/polykinds/T7053.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE PolyKinds, GADTs #-} module T7053 where diff --git a/testsuite/tests/polykinds/T7053.stderr b/testsuite/tests/polykinds/T7053.stderr deleted file mode 100644 index c9ebcfe7b2..0000000000 --- a/testsuite/tests/polykinds/T7053.stderr +++ /dev/null @@ -1,8 +0,0 @@ - -T7053.hs:6:52: - Kind occurs check - The first argument of ‘a’ should have kind ‘k0’, - but ‘b’ has kind ‘k0 -> k1’ - In the type ‘TypeRep (a b)’ - In the definition of data constructor ‘TyApp’ - In the data declaration for ‘TypeRep’ diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T index 82c1824974..5b02dda80c 100644 --- a/testsuite/tests/polykinds/all.T +++ b/testsuite/tests/polykinds/all.T @@ -54,7 +54,7 @@ test('T6137', normal, compile,['']) test('T6093', normal, compile,['']) test('T6049', normal, compile,['']) test('T6129', normal, compile_fail,['']) -test('T7053', normal, compile_fail,['']) +test('T7053', normal, compile,['']) test('T7053a', normal, compile,['']) test('T7020', normal, compile,['']) test('T7022', normal, run_command, ['$MAKE -s --no-print-directory T7022']) |