diff options
Diffstat (limited to 'testsuite/tests')
| -rw-r--r-- | testsuite/tests/ghci.debugger/scripts/break006.stderr | 14 | ||||
| -rw-r--r-- | testsuite/tests/perf/space_leaks/all.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/typecheck/should_fail/T5095.stderr | 8 |
3 files changed, 12 insertions, 13 deletions
diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr index 7929e36cc2..f19a5b3896 100644 --- a/testsuite/tests/ghci.debugger/scripts/break006.stderr +++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr @@ -5,12 +5,11 @@ Use :print or :force to determine these types Relevant bindings include it :: a (bound at <interactive>:4:1) These potential instances exist: - instance (Show b, Show a) => Show (Either a b) - -- Defined in ‘Data.Either’ instance Show Ordering -- Defined in ‘GHC.Show’ instance Show Integer -- Defined in ‘GHC.Show’ - ...plus 23 others - ...plus 42 instances involving out-of-scope types + instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ + ...plus 22 others + ...plus 11 instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it @@ -20,11 +19,10 @@ Use :print or :force to determine these types Relevant bindings include it :: a (bound at <interactive>:6:1) These potential instances exist: - instance (Show b, Show a) => Show (Either a b) - -- Defined in ‘Data.Either’ instance Show Ordering -- Defined in ‘GHC.Show’ instance Show Integer -- Defined in ‘GHC.Show’ - ...plus 23 others - ...plus 42 instances involving out-of-scope types + instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ + ...plus 22 others + ...plus 11 instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it diff --git a/testsuite/tests/perf/space_leaks/all.T b/testsuite/tests/perf/space_leaks/all.T index 0bb21b127f..9d0661f817 100644 --- a/testsuite/tests/perf/space_leaks/all.T +++ b/testsuite/tests/perf/space_leaks/all.T @@ -62,11 +62,12 @@ test('T4029', # 2016-05-23: 82 (amd64/Linux) Use -G1 # 2016-07-13: 92 (amd64/Linux) Changes to tidyType stats_num_field('max_bytes_used', - [(wordsize(64), 25247216, 5)]), + [(wordsize(64), 22920616, 5)]), # 2016-02-26: 24071720 (amd64/Linux) INITIAL # 2016-04-21: 25542832 (amd64/Linux) # 2016-05-23: 25247216 (amd64/Linux) Use -G1 # 2016-07-13: 27575416 (amd64/Linux) Changes to tidyType + # 2016-07-20: 22920616 (amd64/Linux) Fix laziness of instance matching extra_hc_opts('+RTS -G1 -RTS' ), ], ghci_script, diff --git a/testsuite/tests/typecheck/should_fail/T5095.stderr b/testsuite/tests/typecheck/should_fail/T5095.stderr index dc10d40638..a9598115ac 100644 --- a/testsuite/tests/typecheck/should_fail/T5095.stderr +++ b/testsuite/tests/typecheck/should_fail/T5095.stderr @@ -3,11 +3,11 @@ T5095.hs:9:9: 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 b, Eq a) => Eq (Either a b) - -- Defined in ‘Data.Either’ instance Eq Ordering -- Defined in ‘GHC.Classes’ - ...plus 24 others - ...plus 36 instances involving out-of-scope types + instance Eq Integer + -- Defined in ‘integer-gmp-1.0.0.1:GHC.Integer.Type’ + ...plus 23 others + ...plus three instances 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 |