diff options
author | Ben Gamari <bgamari.foss@gmail.com> | 2015-12-15 16:08:52 +0100 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2015-12-15 20:45:59 +0100 |
commit | e2c917381ff099820b1ee30fcfa8bc0c20cf5c1f (patch) | |
tree | f9295bd3f9ab1e4d4b296960d1f046d1eb37b449 /testsuite/tests/typecheck/should_fail | |
parent | 947e44feebb4e979d7d476ff2aa5c7054a1c0899 (diff) | |
download | haskell-e2c917381ff099820b1ee30fcfa8bc0c20cf5c1f.tar.gz |
Narrow scope of special-case for unqualified printing of names in core libraries
Commit 547c597112954353cef7157cb0a389bc4f6303eb modifies the
pretty-printer to render names from a set of core packages (`base`,
`ghc-prim`, `template-haskell`) as unqualified. The idea here was that
many of these names typically are not in scope but are well-known by the
user and therefore qualification merely introduces noise.
This, however, is a very large hammer and potentially breaks any
consumer who relies on parsing GHC output (hence #11208). This commit
partially reverts this change, now only printing `Constraint` (which
appears quite often in errors) as unqualified.
Fixes #11208.
Updates tests in `array` submodule.
Test Plan: validate
Reviewers: hvr, thomie, austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1619
GHC Trac Issues: #11208
Diffstat (limited to 'testsuite/tests/typecheck/should_fail')
12 files changed, 171 insertions, 162 deletions
diff --git a/testsuite/tests/typecheck/should_fail/T10971b.stderr b/testsuite/tests/typecheck/should_fail/T10971b.stderr index 546a9d88ee..8d7b2d392f 100644 --- a/testsuite/tests/typecheck/should_fail/T10971b.stderr +++ b/testsuite/tests/typecheck/should_fail/T10971b.stderr @@ -1,68 +1,72 @@ T10971b.hs:4:11: error: - Ambiguous type variable ‘t2’ arising from a use of ‘length’ - prevents the constraint ‘(Foldable t2)’ from being solved. - Relevant bindings include - x :: t2 a (bound at T10971b.hs:4:6) - f :: t2 a -> Int (bound at T10971b.hs:4:1) - Probable fix: use a type annotation to specify what ‘t2’ should be. - These potential instances exist: - instance Foldable (Const m) -- Defined in ‘Control.Applicative’ - instance Foldable ZipList -- Defined in ‘Control.Applicative’ - instance Foldable (Either a) -- Defined in ‘Data.Foldable’ - ...plus 10 others - (use -fprint-potential-instances to see them all) - In the expression: length x - In the expression: \ x -> length x - In an equation for ‘f’: f = \ x -> length x + • Ambiguous type variable ‘t2’ arising from a use of ‘length’ + prevents the constraint ‘(Foldable t2)’ from being solved. + Relevant bindings include + x :: t2 a (bound at T10971b.hs:4:6) + f :: t2 a -> Int (bound at T10971b.hs:4:1) + Probable fix: use a type annotation to specify what ‘t2’ should be. + These potential instances exist: + instance Foldable (Either a) -- Defined in ‘Data.Foldable’ + instance Foldable Maybe -- Defined in ‘Data.Foldable’ + instance Foldable ((,) a) -- Defined in ‘Data.Foldable’ + ...plus one other + ...plus 9 instance involving out-of-scope typess + (use -fprint-potential-instances to see them all) + • In the expression: length x + In the expression: \ x -> length x + In an equation for ‘f’: f = \ x -> length x T10971b.hs:5:13: error: - Ambiguous type variable ‘t1’ arising from a use of ‘fmapDefault’ - prevents the constraint ‘(Traversable t1)’ from being solved. - Relevant bindings include - x :: t1 a (bound at T10971b.hs:5:8) - g :: (a -> b) -> t1 a -> t1 b (bound at T10971b.hs:5:1) - Probable fix: use a type annotation to specify what ‘t1’ should be. - These potential instances exist: - instance Traversable (Const m) -- Defined in ‘Data.Traversable’ - instance Traversable ZipList -- Defined in ‘Data.Traversable’ - instance Traversable (Either a) -- Defined in ‘Data.Traversable’ - ...plus 10 others - (use -fprint-potential-instances to see them all) - In the expression: fmapDefault f x - In the expression: \ f x -> fmapDefault f x - In an equation for ‘g’: g = \ f x -> fmapDefault f x + • Ambiguous type variable ‘t1’ arising from a use of ‘fmapDefault’ + prevents the constraint ‘(Traversable t1)’ from being solved. + Relevant bindings include + x :: t1 a (bound at T10971b.hs:5:8) + g :: (a -> b) -> t1 a -> t1 b (bound at T10971b.hs:5:1) + Probable fix: use a type annotation to specify what ‘t1’ should be. + These potential instances exist: + instance Traversable (Either a) -- Defined in ‘Data.Traversable’ + instance Traversable Maybe -- Defined in ‘Data.Traversable’ + instance Traversable ((,) a) -- Defined in ‘Data.Traversable’ + ...plus one other + ...plus 9 instance involving out-of-scope typess + (use -fprint-potential-instances to see them all) + • In the expression: fmapDefault f x + In the expression: \ f x -> fmapDefault f x + In an equation for ‘g’: g = \ f x -> fmapDefault f x T10971b.hs:6:14: error: - Ambiguous type variable ‘t0’ arising from a use of ‘fmapDefault’ - prevents the constraint ‘(Traversable t0)’ from being solved. - Relevant bindings include - x :: t0 a (bound at T10971b.hs:6:8) - h :: (a -> b) -> t0 a -> (t0 b, Int) (bound at T10971b.hs:6:1) - Probable fix: use a type annotation to specify what ‘t0’ should be. - These potential instances exist: - instance Traversable (Const m) -- Defined in ‘Data.Traversable’ - instance Traversable ZipList -- Defined in ‘Data.Traversable’ - instance Traversable (Either a) -- Defined in ‘Data.Traversable’ - ...plus 10 others - (use -fprint-potential-instances to see them all) - In the expression: fmapDefault f x - In the expression: (fmapDefault f x, length x) - In the expression: \ f x -> (fmapDefault f x, length x) + • Ambiguous type variable ‘t0’ arising from a use of ‘fmapDefault’ + prevents the constraint ‘(Traversable t0)’ from being solved. + Relevant bindings include + x :: t0 a (bound at T10971b.hs:6:8) + h :: (a -> b) -> t0 a -> (t0 b, Int) (bound at T10971b.hs:6:1) + Probable fix: use a type annotation to specify what ‘t0’ should be. + These potential instances exist: + instance Traversable (Either a) -- Defined in ‘Data.Traversable’ + instance Traversable Maybe -- Defined in ‘Data.Traversable’ + instance Traversable ((,) a) -- Defined in ‘Data.Traversable’ + ...plus one other + ...plus 9 instance involving out-of-scope typess + (use -fprint-potential-instances to see them all) + • In the expression: fmapDefault f x + In the expression: (fmapDefault f x, length x) + In the expression: \ f x -> (fmapDefault f x, length x) T10971b.hs:6:31: error: - Ambiguous type variable ‘t0’ arising from a use of ‘length’ - prevents the constraint ‘(Foldable t0)’ from being solved. - Relevant bindings include - x :: t0 a (bound at T10971b.hs:6:8) - h :: (a -> b) -> t0 a -> (t0 b, Int) (bound at T10971b.hs:6:1) - Probable fix: use a type annotation to specify what ‘t0’ should be. - These potential instances exist: - instance Foldable (Const m) -- Defined in ‘Control.Applicative’ - instance Foldable ZipList -- Defined in ‘Control.Applicative’ - instance Foldable (Either a) -- Defined in ‘Data.Foldable’ - ...plus 10 others - (use -fprint-potential-instances to see them all) - In the expression: length x - In the expression: (fmapDefault f x, length x) - In the expression: \ f x -> (fmapDefault f x, length x) + • Ambiguous type variable ‘t0’ arising from a use of ‘length’ + prevents the constraint ‘(Foldable t0)’ from being solved. + Relevant bindings include + x :: t0 a (bound at T10971b.hs:6:8) + h :: (a -> b) -> t0 a -> (t0 b, Int) (bound at T10971b.hs:6:1) + Probable fix: use a type annotation to specify what ‘t0’ should be. + These potential instances exist: + instance Foldable (Either a) -- Defined in ‘Data.Foldable’ + instance Foldable Maybe -- Defined in ‘Data.Foldable’ + instance Foldable ((,) a) -- Defined in ‘Data.Foldable’ + ...plus one other + ...plus 9 instance involving out-of-scope typess + (use -fprint-potential-instances to see them all) + • In the expression: length x + In the expression: (fmapDefault f x, length x) + In the expression: \ f x -> (fmapDefault f x, length x) diff --git a/testsuite/tests/typecheck/should_fail/T5095.stderr b/testsuite/tests/typecheck/should_fail/T5095.stderr index a854b7ea75..cc338e7afa 100644 --- a/testsuite/tests/typecheck/should_fail/T5095.stderr +++ b/testsuite/tests/typecheck/should_fail/T5095.stderr @@ -1,16 +1,16 @@ T5095.hs:9:11: error: - Overlapping instances for Eq a arising from a use of ‘==’ - Matching instances: - instance [overlappable] Show a => Eq a -- Defined at T5095.hs:5:31 - instance (Eq a, Eq b) => Eq (Either a b) - -- Defined in ‘Data.Either’ - instance Eq All -- Defined in ‘Data.Monoid’ - ...plus 36 others - ...plus one instance involving out-of-scope types - (use -fprint-potential-instances to see them all) - (The choice depends on the instantiation of ‘a’ - To pick the first instance above, use IncoherentInstances - when compiling the other instance declarations) - In the expression: x == y - In an equation for ‘f’: f x y = x == y + • Overlapping instances for Eq a arising from a use of ‘==’ + Matching instances: + instance [overlappable] Show a => Eq a -- Defined at T5095.hs:5:31 + instance (Eq a, Eq b) => Eq (Either a b) + -- Defined in ‘Data.Either’ + instance Eq Ordering -- Defined in ‘GHC.Classes’ + ...plus 24 others + ...plus 13 instance involving out-of-scope typess + (use -fprint-potential-instances to see them all) + (The choice depends on the instantiation of ‘a’ + To pick the first instance above, use IncoherentInstances + when compiling the other instance declarations) + • In the expression: x == y + In an equation for ‘f’: f x y = x == y diff --git a/testsuite/tests/typecheck/should_fail/T8262.stderr b/testsuite/tests/typecheck/should_fail/T8262.stderr index 45e201cc76..d52ee31a31 100644 --- a/testsuite/tests/typecheck/should_fail/T8262.stderr +++ b/testsuite/tests/typecheck/should_fail/T8262.stderr @@ -1,7 +1,7 @@ T8262.hs:5:15: error: • Couldn't match a lifted type with an unlifted type - When matching the kind of ‘Int#’ + When matching the kind of ‘GHC.Prim.Int#’ • In the first argument of ‘Just’, namely ‘(1#)’ In the expression: Just (1#) In an equation for ‘foo’: foo x = Just (1#) diff --git a/testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr b/testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr index 8141caf5b5..1767e8e976 100644 --- a/testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr +++ b/testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr @@ -29,7 +29,8 @@ TcCoercibleFail.hs:18:8: error: • Couldn't match representation of type ‘Int’ with that of ‘Down Int’ arising from a use of ‘coerce’ - The data constructor ‘Down’ of newtype ‘Down’ is not in scope + The data constructor ‘Data.Ord.Down’ + of newtype ‘Down’ is not in scope • In the expression: coerce In the expression: coerce $ one :: Down Int In an equation for ‘foo4’: foo4 = coerce $ one :: Down Int diff --git a/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr b/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr index f63fb47789..e6e637cfeb 100644 --- a/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr +++ b/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr @@ -1,13 +1,15 @@ TcStaticPointersFail02.hs:9:6: error: - No instance for (Typeable b) arising from a static form - In the expression: static (undefined :: (forall a. a -> a) -> b) - In an equation for ‘f1’: - f1 = static (undefined :: (forall a. a -> a) -> b) + • No instance for (Data.Typeable.Internal.Typeable b) + arising from a static form + • In the expression: static (undefined :: (forall a. a -> a) -> b) + In an equation for ‘f1’: + f1 = static (undefined :: (forall a. a -> a) -> b) TcStaticPointersFail02.hs:12:6: error: - No instance for (Typeable (Monad m => a -> m a)) - arising from a static form - (maybe you haven't applied a function to enough arguments?) - In the expression: static return - In an equation for ‘f2’: f2 = static return + • No instance for (Data.Typeable.Internal.Typeable + (Monad m => a -> m a)) + arising from a static form + (maybe you haven't applied a function to enough arguments?) + • In the expression: static return + In an equation for ‘f2’: f2 = static return diff --git a/testsuite/tests/typecheck/should_fail/tcfail068.stderr b/testsuite/tests/typecheck/should_fail/tcfail068.stderr index f80a2cf1bb..5ca47f52ed 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail068.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail068.stderr @@ -3,7 +3,7 @@ tcfail068.hs:14:9: error: • Couldn't match type ‘s1’ with ‘s’ ‘s1’ is a rigid type variable bound by a type expected by the context: - forall s1. ST s1 (IndTree s a) + forall s1. GHC.ST.ST s1 (IndTree s a) at tcfail068.hs:13:9 ‘s’ is a rigid type variable bound by the type signature for: @@ -11,8 +11,8 @@ tcfail068.hs:14:9: error: Constructed a => (Int, Int) -> a -> IndTree s a at tcfail068.hs:11:10 - Expected type: ST s1 (IndTree s a) - Actual type: ST s1 (STArray s1 (Int, Int) a) + Expected type: GHC.ST.ST s1 (IndTree s a) + Actual type: GHC.ST.ST s1 (STArray s1 (Int, Int) a) • In the first argument of ‘runST’, namely ‘(newSTArray ((1, 1), n) x)’ In the expression: runST (newSTArray ((1, 1), n) x) @@ -30,7 +30,7 @@ tcfail068.hs:19:21: error: at tcfail068.hs:16:10 ‘s1’ is a rigid type variable bound by a type expected by the context: - forall s1. ST s1 (IndTree s a) + forall s1. GHC.ST.ST s1 (IndTree s a) at tcfail068.hs:18:9 Expected type: STArray s1 (Int, Int) a Actual type: IndTree s a @@ -51,16 +51,16 @@ tcfail068.hs:24:36: error: at tcfail068.hs:23:10 ‘s1’ is a rigid type variable bound by a type expected by the context: - forall s1. ST s1 (IndTree s a) + forall s1. GHC.ST.ST s1 (IndTree s a) at tcfail068.hs:24:29 - Expected type: ST s1 (IndTree s a) - Actual type: ST s (IndTree s a) + Expected type: GHC.ST.ST s1 (IndTree s a) + Actual type: GHC.ST.ST s (IndTree s a) • In the first argument of ‘runST’, namely ‘(itrap' i k)’ In the expression: runST (itrap' i k) • Relevant bindings include - itrap' :: Int -> Int -> ST s (IndTree s a) + itrap' :: Int -> Int -> GHC.ST.ST s (IndTree s a) (bound at tcfail068.hs:26:9) - itrapsnd :: Int -> Int -> ST s (IndTree s a) + itrapsnd :: Int -> Int -> GHC.ST.ST s (IndTree s a) (bound at tcfail068.hs:29:9) arr :: IndTree s a (bound at tcfail068.hs:24:23) itrap :: ((Int, Int), (Int, Int)) @@ -83,16 +83,16 @@ tcfail068.hs:36:46: error: at tcfail068.hs:34:15 ‘s1’ is a rigid type variable bound by a type expected by the context: - forall s1. ST s1 (c, IndTree s b) + forall s1. GHC.ST.ST s1 (c, IndTree s b) at tcfail068.hs:36:40 - Expected type: ST s1 (c, IndTree s b) - Actual type: ST s (c, IndTree s b) + Expected type: GHC.ST.ST s1 (c, IndTree s b) + Actual type: GHC.ST.ST s (c, IndTree s b) • In the first argument of ‘runST’, namely ‘(itrapstate' i k s)’ In the expression: runST (itrapstate' i k s) • Relevant bindings include - itrapstate' :: Int -> Int -> c -> ST s (c, IndTree s b) + itrapstate' :: Int -> Int -> c -> GHC.ST.ST s (c, IndTree s b) (bound at tcfail068.hs:38:9) - itrapstatesnd :: Int -> Int -> c -> ST s (c, IndTree s b) + itrapstatesnd :: Int -> Int -> c -> GHC.ST.ST s (c, IndTree s b) (bound at tcfail068.hs:41:9) arr :: IndTree s b (bound at tcfail068.hs:36:34) itrapstate :: ((Int, Int), (Int, Int)) diff --git a/testsuite/tests/typecheck/should_fail/tcfail072.stderr b/testsuite/tests/typecheck/should_fail/tcfail072.stderr index fa6752b37b..200b7f0d6d 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail072.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail072.stderr @@ -1,18 +1,18 @@ tcfail072.hs:23:13: error: - Could not deduce (Ord p0) arising from a use of ‘g’ - from the context: (Ord p, Ord q) - bound by the type signature for: - g :: (Ord p, Ord q) => AB p q -> Bool - at tcfail072.hs:22:1-38 - The type variable ‘p0’ is ambiguous - These potential instances exist: - instance Ord Ordering -- Defined in ‘GHC.Classes’ - instance Ord TyCon -- Defined in ‘GHC.Classes’ - instance Ord Integer - -- Defined in ‘integer-gmp-1.0.0.0:GHC.Integer.Type’ - ...plus 23 others - ...plus one instance involving out-of-scope types - (use -fprint-potential-instances to see them all) - In the expression: g A - In an equation for ‘g’: g (B _ _) = g A + • Could not deduce (Ord p0) arising from a use of ‘g’ + from the context: (Ord p, Ord q) + bound by the type signature for: + g :: (Ord p, Ord q) => AB p q -> Bool + at tcfail072.hs:22:1-38 + The type variable ‘p0’ is ambiguous + These potential instances exist: + instance Ord Ordering -- Defined in ‘GHC.Classes’ + instance Ord Integer + -- Defined in ‘integer-gmp-1.0.0.0:GHC.Integer.Type’ + instance Ord a => Ord (Maybe a) -- Defined in ‘GHC.Base’ + ...plus 22 others + ...plus two instance involving out-of-scope typess + (use -fprint-potential-instances to see them all) + • In the expression: g A + In an equation for ‘g’: g (B _ _) = g A diff --git a/testsuite/tests/typecheck/should_fail/tcfail123.stderr b/testsuite/tests/typecheck/should_fail/tcfail123.stderr index 00b8bbdd10..8f5f0a0afe 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail123.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail123.stderr @@ -1,7 +1,7 @@ tcfail123.hs:11:9: error: - Couldn't match a lifted type with an unlifted type - When matching the kind of ‘Int#’ - In the first argument of ‘f’, namely ‘3#’ - In the expression: f 3# - In an equation for ‘h’: h v = f 3# + • Couldn't match a lifted type with an unlifted type + When matching the kind of ‘GHC.Prim.Int#’ + • In the first argument of ‘f’, namely ‘3#’ + In the expression: f 3# + In an equation for ‘h’: h v = f 3# diff --git a/testsuite/tests/typecheck/should_fail/tcfail128.stderr b/testsuite/tests/typecheck/should_fail/tcfail128.stderr index 1aab117592..63e314d80c 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail128.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail128.stderr @@ -1,22 +1,22 @@ tcfail128.hs:18:16: error: - Ambiguous type variable ‘b0’ arising from a use of ‘thaw’ - prevents the constraint ‘(Data.Array.Base.MArray - b0 FlatVector IO)’ from being solved. - Probable fix: use a type annotation to specify what ‘b0’ should be. - These potential instance exist: - instance Data.Array.Base.MArray IOArray e IO - -- Defined in ‘Data.Array.Base’ - In a stmt of a 'do' block: v <- thaw tmp - In the expression: - do { let sL = ... - dim = length sL - ....; - v <- thaw tmp; - return () } - In an equation for ‘main’: - main - = do { let sL = ... - ....; - v <- thaw tmp; - return () } + • Ambiguous type variable ‘b0’ arising from a use of ‘thaw’ + prevents the constraint ‘(Data.Array.Base.MArray + b0 FlatVector IO)’ from being solved. + Probable fix: use a type annotation to specify what ‘b0’ should be. + These potential instance exist: + one instance involving out-of-scope types + (use -fprint-potential-instances to see them all) + • In a stmt of a 'do' block: v <- thaw tmp + In the expression: + do { let sL = ... + dim = length sL + ....; + v <- thaw tmp; + return () } + In an equation for ‘main’: + main + = do { let sL = ... + ....; + v <- thaw tmp; + return () } diff --git a/testsuite/tests/typecheck/should_fail/tcfail133.stderr b/testsuite/tests/typecheck/should_fail/tcfail133.stderr index f629ea0140..ac85d0be71 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail133.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail133.stderr @@ -3,25 +3,27 @@ tcfail133.hs:2:61: warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language. tcfail133.hs:68:7: error: - Ambiguous type variable ‘a0’ arising from a use of ‘show’ - prevents the constraint ‘(Show a0)’ from being solved. - Probable fix: use a type annotation to specify what ‘a0’ should be. - These potential instances exist: - instance Show Module -- Defined in ‘GHC.Show’ - instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show TrName -- Defined in ‘GHC.Show’ - ...plus 28 others - (use -fprint-potential-instances to see them all) - In the expression: show - In the expression: show $ add (One :@ Zero) (One :@ One) - In an equation for ‘foo’: - foo = show $ add (One :@ Zero) (One :@ One) + • Ambiguous type variable ‘a0’ arising from a use of ‘show’ + prevents the constraint ‘(Show a0)’ from being solved. + Probable fix: use a type annotation to specify what ‘a0’ should be. + These potential instances exist: + instance Show Ordering -- Defined in ‘GHC.Show’ + instance Show Integer -- Defined in ‘GHC.Show’ + instance (Show a, Show b, Number a, Digit b) => Show (a :@ b) + -- Defined at tcfail133.hs:11:54 + ...plus 25 others + ...plus three instance involving out-of-scope typess + (use -fprint-potential-instances to see them all) + • In the expression: show + In the expression: show $ add (One :@ Zero) (One :@ One) + In an equation for ‘foo’: + foo = show $ add (One :@ Zero) (One :@ One) tcfail133.hs:68:14: error: - No instance for (AddDigit (Zero :@ (One :@ One)) One a0) - arising from a use of ‘add’ - In the second argument of ‘($)’, namely - ‘add (One :@ Zero) (One :@ One)’ - In the expression: show $ add (One :@ Zero) (One :@ One) - In an equation for ‘foo’: - foo = show $ add (One :@ Zero) (One :@ One) + • No instance for (AddDigit (Zero :@ (One :@ One)) One a0) + arising from a use of ‘add’ + • In the second argument of ‘($)’, namely + ‘add (One :@ Zero) (One :@ One)’ + In the expression: show $ add (One :@ Zero) (One :@ One) + In an equation for ‘foo’: + foo = show $ add (One :@ Zero) (One :@ One) diff --git a/testsuite/tests/typecheck/should_fail/tcfail200.stderr b/testsuite/tests/typecheck/should_fail/tcfail200.stderr index c8a6fa94f2..407265ee9d 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail200.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail200.stderr @@ -1,7 +1,7 @@ tcfail200.hs:5:15: error: • Couldn't match a lifted type with an unlifted type - When matching the kind of ‘Int#’ + When matching the kind of ‘GHC.Prim.Int#’ • In the expression: 1# In the expression: (1#, 'c') In an equation for ‘x’: x = (1#, 'c') diff --git a/testsuite/tests/typecheck/should_fail/tcfail220.stderr b/testsuite/tests/typecheck/should_fail/tcfail220.stderr index d78fa6d83e..6228bfa984 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail220.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail220.stderr @@ -3,7 +3,7 @@ tcfail220.hsig:4:1: error: Type constructor ‘Either’ has conflicting definitions in the module and its hsig file - Main module: data Either a b = Left a | Right b + Main module: data Either a b = Left a | Data.Either.Right b Hsig file: type role Either representational phantom phantom data Either a b c = Left a The types have different kinds |