summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/codeGen/should_run/T12855.hs1
-rw-r--r--testsuite/tests/ghci/scripts/T11051b.stdout2
-rw-r--r--testsuite/tests/ghci/scripts/ghci025.stdout52
-rw-r--r--testsuite/tests/partial-sigs/should_compile/T12844.hs1
-rw-r--r--testsuite/tests/typecheck/T12441/T12441.hs5
-rw-r--r--testsuite/tests/typecheck/T12441/T12441.hs-boot3
-rw-r--r--testsuite/tests/typecheck/T12441/T12441.stderr10
-rw-r--r--testsuite/tests/typecheck/T12441/T12441A.hs2
-rw-r--r--testsuite/tests/typecheck/T12441/all.T4
-rw-r--r--testsuite/tests/typecheck/should_compile/Improvement.hs2
10 files changed, 40 insertions, 42 deletions
diff --git a/testsuite/tests/codeGen/should_run/T12855.hs b/testsuite/tests/codeGen/should_run/T12855.hs
index 6cc9f2f75b..0561995f8b 100644
--- a/testsuite/tests/codeGen/should_run/T12855.hs
+++ b/testsuite/tests/codeGen/should_run/T12855.hs
@@ -6,4 +6,3 @@ import qualified Data.ByteString.Char8 as S8
main :: IO ()
main = (S8.concat (map S.singleton (S.unpack (S8.pack "<foo>"))) == S8.empty) `seq` return ()
-
diff --git a/testsuite/tests/ghci/scripts/T11051b.stdout b/testsuite/tests/ghci/scripts/T11051b.stdout
index 7eb3f08217..613bf15c3a 100644
--- a/testsuite/tests/ghci/scripts/T11051b.stdout
+++ b/testsuite/tests/ghci/scripts/T11051b.stdout
@@ -1 +1 @@
-data Hello = Hello Int
+data Hello = ...
diff --git a/testsuite/tests/ghci/scripts/ghci025.stdout b/testsuite/tests/ghci/scripts/ghci025.stdout
index dd3a757b80..d660d233cd 100644
--- a/testsuite/tests/ghci/scripts/ghci025.stdout
+++ b/testsuite/tests/ghci/scripts/ghci025.stdout
@@ -4,21 +4,15 @@
T.length :: T.Integer
class N a
class S a
-class C a b where
- c1 :: N b => a -> b
- c2 :: (N b, S b) => a -> b
- c3 :: a1 -> b
- c4 :: a1 -> b
- {-# MINIMAL c1, c2, c3, c4 #-}
+class C a b
+ ...
c1 :: (C a b, N b) => a -> b
c2 :: (C a b, N b, S b) => a -> b
c3 :: C a b => forall a. a -> b
c4 :: C a b => forall a1. a1 -> b
-- imported via Control.Monad
-class (GHC.Base.Alternative m, Monad m) =>
- MonadPlus (m :: * -> *) where
- mzero :: m a
- mplus :: m a -> m a -> m a
+class (GHC.Base.Alternative m, Monad m) => MonadPlus (m :: * -> *)
+ ...
mplus :: MonadPlus m => forall a. m a -> m a -> m a
mzero :: MonadPlus m => forall a. m a
-- imported via Control.Monad, Prelude
@@ -27,12 +21,8 @@ mzero :: MonadPlus m => forall a. m a
fail :: Monad m => forall a. GHC.Base.String -> m a
return :: Monad m => forall a. a -> m a
-- imported via Control.Monad, Prelude, T
-class GHC.Base.Applicative m => Monad (m :: * -> *) where
- (>>=) :: m a -> (a -> m b) -> m b
- (>>) :: m a -> m b -> m b
- return :: a -> m a
- fail :: GHC.Base.String -> m a
- {-# MINIMAL (>>=) #-}
+class GHC.Base.Applicative m => Monad (m :: * -> *)
+ ...
-- imported via Data.Maybe
catMaybes :: [Maybe a] -> [a]
fromJust :: Maybe a -> a
@@ -45,35 +35,26 @@ maybe :: b -> (a -> b) -> Maybe a -> b
maybeToList :: Maybe a -> [a]
-- imported via Data.Maybe, Prelude
Just :: a -> Maybe a
-data Maybe a = Nothing | Just a
+data Maybe a = ...
Nothing :: Maybe a
-- imported via Prelude
(+) :: GHC.Num.Num a => a -> a -> a
(=<<) :: Monad m => (a -> m b) -> m a -> m b
-class Eq a where
- (GHC.Classes.==) :: a -> a -> GHC.Types.Bool
- (GHC.Classes./=) :: a -> a -> GHC.Types.Bool
- {-# MINIMAL (==) | (/=) #-}
+class Eq a
+ ...
-- imported via Prelude, T
Prelude.length ::
Data.Foldable.Foldable t => forall a. t a -> GHC.Types.Int
-- imported via T
-data T.Integer
- = integer-gmp-1.0.0.1:GHC.Integer.Type.S# !GHC.Prim.Int#
- | integer-gmp-1.0.0.1:GHC.Integer.Type.Jp# {-# UNPACK #-}integer-gmp-1.0.0.1:GHC.Integer.Type.BigNat
- | integer-gmp-1.0.0.1:GHC.Integer.Type.Jn# {-# UNPACK #-}integer-gmp-1.0.0.1:GHC.Integer.Type.BigNat
+data T.Integer = ...
T.length :: Data.ByteString.Internal.ByteString -> GHC.Types.Int
:browse! T
-- defined locally
T.length :: T.Integer
class N a
class S a
-class C a b where
- c1 :: N b => a -> b
- c2 :: (N b, S b) => a -> b
- c3 :: a1 -> b
- c4 :: a1 -> b
- {-# MINIMAL c1, c2, c3, c4 #-}
+class C a b
+ ...
c1 :: (C a b, N b) => a -> b
c2 :: (C a b, N b, S b) => a -> b
c3 :: C a b => forall a. a -> b
@@ -83,12 +64,8 @@ c4 :: C a b => forall a1. a1 -> b
T.length :: T.Integer
class N a
class S a
-class C a b where
- c1 :: N b => a -> b
- c2 :: (N b, S b) => a -> b
- c3 :: forall a1. a1 -> b
- c4 :: forall a1. a1 -> b
- {-# MINIMAL c1, c2, c3, c4 #-}
+class C a b
+ ...
c1 :: forall a b. (C a b, N b) => a -> b
c2 :: forall a b. (C a b, N b, S b) => a -> b
c3 :: forall a b. C a b => forall a. a -> b
@@ -117,3 +94,4 @@ Ghci025C.g :: forall {a}. Num a => a -> a
Ghci025C.h :: forall {a}. Integral a => a -> a
-- defined locally
f :: forall {a}. Num a => a -> a
+
diff --git a/testsuite/tests/partial-sigs/should_compile/T12844.hs b/testsuite/tests/partial-sigs/should_compile/T12844.hs
index d47b82cc64..77c6c2a87c 100644
--- a/testsuite/tests/partial-sigs/should_compile/T12844.hs
+++ b/testsuite/tests/partial-sigs/should_compile/T12844.hs
@@ -17,4 +17,3 @@ data FooData rngs
class Foo xs where foo :: (Head xs ~ '(r,r')) => FooData xs
type family Head (xs :: [k]) where Head (x ': xs) = x
-
diff --git a/testsuite/tests/typecheck/T12441/T12441.hs b/testsuite/tests/typecheck/T12441/T12441.hs
new file mode 100644
index 0000000000..5b3aeab87b
--- /dev/null
+++ b/testsuite/tests/typecheck/T12441/T12441.hs
@@ -0,0 +1,5 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+module T12441 where
+import T12441A
+f :: forall b a. (a, b)
+f = undefined
diff --git a/testsuite/tests/typecheck/T12441/T12441.hs-boot b/testsuite/tests/typecheck/T12441/T12441.hs-boot
new file mode 100644
index 0000000000..c02e05a90c
--- /dev/null
+++ b/testsuite/tests/typecheck/T12441/T12441.hs-boot
@@ -0,0 +1,3 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+module T12441 where
+f :: forall a b. (a, b)
diff --git a/testsuite/tests/typecheck/T12441/T12441.stderr b/testsuite/tests/typecheck/T12441/T12441.stderr
new file mode 100644
index 0000000000..fe6b471d52
--- /dev/null
+++ b/testsuite/tests/typecheck/T12441/T12441.stderr
@@ -0,0 +1,10 @@
+[1 of 3] Compiling T12441[boot] ( T12441.hs-boot, T12441.o-boot )
+[2 of 3] Compiling T12441A ( T12441A.hs, T12441A.o )
+[3 of 3] Compiling T12441 ( T12441.hs, T12441.o )
+
+T12441.hs-boot:3:1:
+ Identifier ‘f’ has conflicting definitions in the module
+ and its hs-boot file
+ Main module: f :: forall b a. (a, b)
+ Boot file: f :: forall a b. (a, b)
+ The two types are different
diff --git a/testsuite/tests/typecheck/T12441/T12441A.hs b/testsuite/tests/typecheck/T12441/T12441A.hs
new file mode 100644
index 0000000000..cb6be4f144
--- /dev/null
+++ b/testsuite/tests/typecheck/T12441/T12441A.hs
@@ -0,0 +1,2 @@
+module T12441A where
+import {-# SOURCE #-} T12441
diff --git a/testsuite/tests/typecheck/T12441/all.T b/testsuite/tests/typecheck/T12441/all.T
new file mode 100644
index 0000000000..09b1b3e1c1
--- /dev/null
+++ b/testsuite/tests/typecheck/T12441/all.T
@@ -0,0 +1,4 @@
+test('T12441',
+ [],
+ multimod_compile_fail,
+ ['T12441', '-fforce-recomp'])
diff --git a/testsuite/tests/typecheck/should_compile/Improvement.hs b/testsuite/tests/typecheck/should_compile/Improvement.hs
index 8df81c26a7..b7bda66813 100644
--- a/testsuite/tests/typecheck/should_compile/Improvement.hs
+++ b/testsuite/tests/typecheck/should_compile/Improvement.hs
@@ -24,5 +24,3 @@ blug = error "Urk"
foo :: Bool
foo = blug undefined
-
-
View Lorry Controller Status