Sorry about this. I carefully fixed all these and validated...thanks for fixing Simon | -----Original Message----- | From: ghc-commits [mailto:ghc-commits-bounces@haskell.org] On Behalf Of | git@git.haskell.org | Sent: 27 May 2017 15:45 | To: ghc-commits@haskell.org | Subject: [commit: ghc] master: Fix test output after 'Some tidying up of | type pretty-printing' (09d5c99) | | Repository : ssh://git@git.haskell.org/ghc | | On branch : master | Link : | https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fghc.haske | ll.org%2Ftrac%2Fghc%2Fchangeset%2F09d5c993aae208e3d34a9e715297922b6ea42b3 | f%2Fghc&data=02%7C01%7Csimonpj%40microsoft.com%7Ca2a237b8dabd42f3684f08d4 | a50ef9ad%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636314931129891311& | sdata=VM04DE0U1RBSmJjbV6vCwu8LPvyqwqfo2K1I03W1cW4%3D&reserved=0 | | >--------------------------------------------------------------- | | commit 09d5c993aae208e3d34a9e715297922b6ea42b3f | Author: Bartosz Nitka | Date: Sat May 27 07:42:26 2017 -0700 | | Fix test output after 'Some tidying up of type pretty-printing' | | Most are cosmetic. There's an interesting change in T7861, | but the error is still accurate. | | | >--------------------------------------------------------------- | | 09d5c993aae208e3d34a9e715297922b6ea42b3f | testsuite/tests/typecheck/should_run/T7861.stderr | 6 +----- | testsuite/tests/typecheck/should_run/Typeable1.stderr | 2 +- | testsuite/tests/typecheck/should_run/tcrun045.stderr | 6 +++--- | 3 files changed, 5 insertions(+), 9 deletions(-) | | diff --git a/testsuite/tests/typecheck/should_run/T7861.stderr | b/testsuite/tests/typecheck/should_run/T7861.stderr | index e9ee5e9..4a1c030 100644 | --- a/testsuite/tests/typecheck/should_run/T7861.stderr | +++ b/testsuite/tests/typecheck/should_run/T7861.stderr | @@ -1,9 +1,5 @@ | T7861: T7861.hs:10:5: error: | - • Couldn't match type ‘a’ with ‘[a]’ | - ‘a’ is a rigid type variable bound by | - the type signature for: | - f :: forall a. (forall b. a) -> a | - at T7861.hs:9:1-23 | + • Occurs check: cannot construct the infinite type: a ~ [a] | Expected type: (forall b. a) -> a | Actual type: (forall b. a) -> [a] | • In the expression: doA | diff --git a/testsuite/tests/typecheck/should_run/Typeable1.stderr | b/testsuite/tests/typecheck/should_run/Typeable1.stderr | index 9a7d3b7..65f6fd4 100644 | --- a/testsuite/tests/typecheck/should_run/Typeable1.stderr | +++ b/testsuite/tests/typecheck/should_run/Typeable1.stderr | @@ -7,7 +7,7 @@ Typeable1.hs:22:5: error: | App :: forall k2 (t :: k2). | () => | forall k1 (a :: k1 -> k2) (b :: k1). | - t ~ a b => | + (t ~ a b) => | TypeRep a -> TypeRep b -> TypeRep t, | in a pattern binding in | 'do' block | diff --git a/testsuite/tests/typecheck/should_run/tcrun045.stderr | b/testsuite/tests/typecheck/should_run/tcrun045.stderr | index 19fca10..f6b1652 100644 | --- a/testsuite/tests/typecheck/should_run/tcrun045.stderr | +++ b/testsuite/tests/typecheck/should_run/tcrun045.stderr | @@ -1,18 +1,18 @@ | | tcrun045.hs:11:10: error: | • Illegal implicit parameter ‘?imp::Int’ | - • In the context: (?imp::Int) | + • In the context: ?imp::Int | While checking an instance declaration | In the instance declaration for ‘C Int’ | | tcrun045.hs:24:1: error: | • Illegal implicit parameter ‘?imp::Int’ | - • In the context: (?imp::Int) | + • In the context: ?imp::Int | While checking the super-classes of class ‘D’ | In the class declaration for ‘D’ | | tcrun045.hs:27:10: error: | • Illegal implicit parameter ‘?imp::Int’ | - • In the context: (?imp::Int) | + • In the context: ?imp::Int | While checking an instance declaration | In the instance declaration for ‘D Int’ | | _______________________________________________ | ghc-commits mailing list | ghc-commits@haskell.org | https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.hask | ell.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc- | commits&data=02%7C01%7Csimonpj%40microsoft.com%7Ca2a237b8dabd42f3684f08d4 | a50ef9ad%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636314931129891311& | sdata=MYdcDMAQcDnFVFlc0aNT1NXPHFa%2FT%2FSpNiDIu4hrvOY%3D&reserved=0