diff options
| author | Austin Seipp <austin@well-typed.com> | 2014-04-20 01:10:15 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-04-20 16:55:22 -0500 |
| commit | 3608f657d55b7ea7dd711556a4faf6a15c509163 (patch) | |
| tree | 9fdb4340aa5f33833741f1c3459c409c6c960090 /testsuite/tests/typecheck/should_fail | |
| parent | 35d95a2abe944f8c51c9faf798a404f458bc2ad2 (diff) | |
| download | haskell-3608f657d55b7ea7dd711556a4faf6a15c509163.tar.gz | |
Deprecate the AMP warnings.
Now that we're in development mode, Applicative will soon be a
superclass of Monad in HEAD. So let's go ahead and deprecate the
-fno-warn-amp flag, remove the checks, and tweak a few tests
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'testsuite/tests/typecheck/should_fail')
4 files changed, 2 insertions, 5 deletions
diff --git a/testsuite/tests/typecheck/should_fail/T5095.stderr b/testsuite/tests/typecheck/should_fail/T5095.stderr index 25f1185425..614c99cb11 100644 --- a/testsuite/tests/typecheck/should_fail/T5095.stderr +++ b/testsuite/tests/typecheck/should_fail/T5095.stderr @@ -56,8 +56,6 @@ T5095.hs:9:11: instance Eq Ordering -- Defined in ‘GHC.Classes’ instance Eq GHC.Types.Word -- Defined in ‘GHC.Classes’ instance Eq a => Eq [a] -- Defined in ‘GHC.Classes’ - instance Eq a => Eq (Control.Applicative.ZipList a) - -- Defined in ‘Control.Applicative’ instance Eq Integer -- Defined in ‘integer-gmp:GHC.Integer.Type’ (The choice depends on the instantiation of ‘a’ To pick the first instance above, use IncoherentInstances diff --git a/testsuite/tests/typecheck/should_fail/tcfail072.stderr b/testsuite/tests/typecheck/should_fail/tcfail072.stderr index aa5fcc9c7e..dc301a8e60 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail072.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail072.stderr @@ -11,6 +11,6 @@ tcfail072.hs:23:13: -- Defined in ‘GHC.Real’ instance Ord () -- Defined in ‘GHC.Classes’ instance (Ord a, Ord b) => Ord (a, b) -- Defined in ‘GHC.Classes’ - ...plus 23 others + ...plus 22 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 8d03d24347..b23b9447ae 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 27 others + ...plus 26 others In the expression: show In the expression: show $ add (One :@ Zero) (One :@ One) In an equation for ‘foo’: diff --git a/testsuite/tests/typecheck/should_fail/tcfail181.stderr b/testsuite/tests/typecheck/should_fail/tcfail181.stderr index 905a523174..3502f2bbea 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail181.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail181.stderr @@ -10,7 +10,6 @@ tcfail181.hs:17:9: instance Monad ((->) r) -- Defined in ‘GHC.Base’ instance Monad IO -- Defined in ‘GHC.Base’ instance Monad [] -- Defined in ‘GHC.Base’ - ...plus one other In the expression: foo In the expression: foo {bar = return True} In an equation for ‘wog’: wog x = foo {bar = return True} |