[commit: ghc] wip/orf-reboot: Fix test wibbles (1c1f6b2)

git at git.haskell.org git at git.haskell.org
Thu Oct 15 19:05:28 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/orf-reboot
Link       : http://ghc.haskell.org/trac/ghc/changeset/1c1f6b2f539fe157e36af68ee7e5089f04fa254f/ghc

>---------------------------------------------------------------

commit 1c1f6b2f539fe157e36af68ee7e5089f04fa254f
Author: Adam Gundry <adam at well-typed.com>
Date:   Thu Oct 15 20:02:12 2015 +0100

    Fix test wibbles


>---------------------------------------------------------------

1c1f6b2f539fe157e36af68ee7e5089f04fa254f
 compiler/typecheck/TcRnTypes.hs                                         | 2 +-
 .../tests/overloadedrecflds/should_fail/overloadedrecfldsfail08.stderr  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index dec6fce..d25fdb4 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -2301,7 +2301,7 @@ pprCtOrigin simple_origin
 ----------------
 pprCtO :: CtOrigin -> SDoc  -- Ones that are short one-liners
 pprCtO (OccurrenceOf name)   = hsep [ptext (sLit "a use of"), quotes (ppr name)]
-pprCtO (OccurrenceOfRecSel name) = hsep [ptext (sLit "a use of the record selector"), quotes (ppr name)]
+pprCtO (OccurrenceOfRecSel name) = hsep [ptext (sLit "a use of"), quotes (ppr name)]
 pprCtO AppOrigin             = ptext (sLit "an application")
 pprCtO (IPOccOrigin name)    = hsep [ptext (sLit "a use of implicit parameter"), quotes (ppr name)]
 pprCtO RecordUpdOrigin       = ptext (sLit "a record update")
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail08.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail08.stderr
index 84db6ee..cf37520 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail08.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail08.stderr
@@ -1,5 +1,5 @@
 
 overloadedrecfldsfail08.hs:9:9: error:
-    No type has all these fields: ‘x’, ‘y’
+    No constructor has all these fields: ‘x’, ‘y’
     In the expression: e {x = 3, y = True}
     In an equation for ‘foo’: foo e = e {x = 3, y = True}



More information about the ghc-commits mailing list