diff options
9 files changed, 20 insertions, 28 deletions
diff --git a/testsuite/tests/annotations/should_fail/annfail10.stderr b/testsuite/tests/annotations/should_fail/annfail10.stderr index 17d380ea7b..4723db19cb 100644 --- a/testsuite/tests/annotations/should_fail/annfail10.stderr +++ b/testsuite/tests/annotations/should_fail/annfail10.stderr @@ -19,7 +19,6 @@ annfail10.hs:9:11: Note: there are several potential instances: instance Num Double -- Defined in ‘GHC.Float’ instance Num Float -- Defined in ‘GHC.Float’ - instance Integral a => Num (GHC.Real.Ratio a) - -- Defined in ‘GHC.Real’ + instance Num Int -- Defined in ‘GHC.Num’ ...plus 11 others In the annotation: {-# ANN f 1 #-} diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr index bd0d45de38..6f4cbdfe19 100644 --- a/testsuite/tests/ghci.debugger/scripts/break006.stderr +++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr @@ -7,9 +7,8 @@ Note: there are several potential instances: instance Show Double -- Defined in ‘GHC.Float’ instance Show Float -- Defined in ‘GHC.Float’ - instance (Integral a, Show a) => Show (GHC.Real.Ratio a) - -- Defined in ‘GHC.Real’ - ...plus 23 others + instance Show () -- Defined in ‘GHC.Show’ + ...plus 22 others In a stmt of an interactive GHCi command: print it <interactive>:8:1: @@ -20,7 +19,6 @@ Note: there are several potential instances: instance Show Double -- Defined in ‘GHC.Float’ instance Show Float -- Defined in ‘GHC.Float’ - instance (Integral a, Show a) => Show (GHC.Real.Ratio a) - -- Defined in ‘GHC.Real’ - ...plus 23 others + instance Show () -- Defined in ‘GHC.Show’ + ...plus 22 others In a stmt of an interactive GHCi command: print it diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr index e364f06f03..883768bbf9 100644 --- a/testsuite/tests/ghci.debugger/scripts/print019.stderr +++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr @@ -8,5 +8,5 @@ instance Show Unary -- Defined at ../Test.hs:37:29 instance Show a => Show (MkT2 a) -- Defined at ../Test.hs:20:12 instance Show a => Show (MkT a) -- Defined at ../Test.hs:17:13 - ...plus 31 others + ...plus 30 others In a stmt of an interactive GHCi command: print it diff --git a/testsuite/tests/ghci/scripts/Defer02.stderr b/testsuite/tests/ghci/scripts/Defer02.stderr index 7635c8f804..ba2354bb87 100644 --- a/testsuite/tests/ghci/scripts/Defer02.stderr +++ b/testsuite/tests/ghci/scripts/Defer02.stderr @@ -71,9 +71,8 @@ Note: there are several potential instances: instance Num Double -- Defined in ‘GHC.Float’ instance Num Float -- Defined in ‘GHC.Float’ - instance Integral a => Num (GHC.Real.Ratio a) - -- Defined in ‘GHC.Real’ - ...plus three others + instance Num Int -- Defined in ‘GHC.Num’ + ...plus two others In the first argument of ‘myOp’, namely ‘23’ In the expression: myOp 23 In an equation for ‘j’: j = myOp 23 diff --git a/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr b/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr index cfa2b94a55..c5338bc43b 100644 --- a/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr +++ b/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr @@ -5,9 +5,8 @@ overloadedlistsfail01.hs:5:8: Note: there are several potential instances: instance Show Double -- Defined in ‘GHC.Float’ instance Show Float -- Defined in ‘GHC.Float’ - instance (Integral a, Show a) => Show (GHC.Real.Ratio a) - -- Defined in ‘GHC.Real’ - ...plus 23 others + instance Show () -- Defined in ‘GHC.Show’ + ...plus 22 others In the expression: print [1] In an equation for ‘main’: main = print [1] @@ -28,9 +27,8 @@ overloadedlistsfail01.hs:5:15: Note: there are several potential instances: instance Num Double -- Defined in ‘GHC.Float’ instance Num Float -- Defined in ‘GHC.Float’ - instance Integral a => Num (GHC.Real.Ratio a) - -- Defined in ‘GHC.Real’ - ...plus three others + instance Num Int -- Defined in ‘GHC.Num’ + ...plus two others In the expression: 1 In the first argument of ‘print’, namely ‘[1]’ In the expression: print [1] diff --git a/testsuite/tests/typecheck/should_compile/holes2.stderr b/testsuite/tests/typecheck/should_compile/holes2.stderr index 0c7e5666b4..6161433f89 100644 --- a/testsuite/tests/typecheck/should_compile/holes2.stderr +++ b/testsuite/tests/typecheck/should_compile/holes2.stderr @@ -5,9 +5,8 @@ holes2.hs:3:5: Warning: Note: there are several potential instances: instance Show Double -- Defined in ‘GHC.Float’ instance Show Float -- Defined in ‘GHC.Float’ - instance (Integral a, Show a) => Show (GHC.Real.Ratio a) - -- Defined in ‘GHC.Real’ - ...plus 23 others + instance Show () -- Defined in ‘GHC.Show’ + ...plus 22 others In the expression: show _ In an equation for ‘f’: f = show _ diff --git a/testsuite/tests/typecheck/should_fail/tcfail008.stderr b/testsuite/tests/typecheck/should_fail/tcfail008.stderr index c633a15325..38682cc1e8 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail008.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail008.stderr @@ -6,9 +6,8 @@ tcfail008.hs:3:5: Note: there are several potential instances: instance Num Double -- Defined in ‘GHC.Float’ instance Num Float -- Defined in ‘GHC.Float’ - instance Integral a => Num (GHC.Real.Ratio a) - -- Defined in ‘GHC.Real’ - ...plus three others + instance Num Int -- Defined in ‘GHC.Num’ + ...plus two others In the first argument of ‘(:)’, namely ‘1’ In the expression: 1 : 2 In an equation for ‘o’: o = 1 : 2 diff --git a/testsuite/tests/typecheck/should_fail/tcfail072.stderr b/testsuite/tests/typecheck/should_fail/tcfail072.stderr index dc301a8e60..37bb8b3ad3 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail072.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail072.stderr @@ -7,10 +7,10 @@ tcfail072.hs:23:13: at tcfail072.hs:22:6-38 The type variable ‘q0’ is ambiguous Note: there are several potential instances: - instance Integral a => Ord (GHC.Real.Ratio a) - -- Defined in ‘GHC.Real’ instance Ord () -- Defined in ‘GHC.Classes’ instance (Ord a, Ord b) => Ord (a, b) -- Defined in ‘GHC.Classes’ - ...plus 22 others + instance (Ord a, Ord b, Ord c) => Ord (a, b, c) + -- Defined in ‘GHC.Classes’ + ...plus 21 others In the expression: g A In an equation for ‘g’: g (B _ _) = g A diff --git a/testsuite/tests/typecheck/should_fail/tcfail133.stderr b/testsuite/tests/typecheck/should_fail/tcfail133.stderr index b23b9447ae..058b06392f 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail133.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail133.stderr @@ -10,7 +10,7 @@ tcfail133.hs:68:7: instance Show One -- Defined at tcfail133.hs:9:28 instance (Show a, Show b, Number a, Digit b) => Show (a :@ b) -- Defined at tcfail133.hs:11:54 - ...plus 26 others + ...plus 25 others In the expression: show In the expression: show $ add (One :@ Zero) (One :@ One) In an equation for ‘foo’: |