[commit: ghc] master: Fix some validation errors. (889c81c)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/889c81c657b5719a8f4091099b7bf186127e9f53/ghc

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

commit 889c81c657b5719a8f4091099b7bf186127e9f53
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sat Jul 4 09:38:59 2015 +0200

    Fix some validation errors.
    
    Summary:
    This fixes test cases T10019 and T10534
    
    The patch for T10019 should be back-ported to master as well.
    
    Posting via Phab as a way to distribute a patch against the
    ghc-7.10 branch, which I don't have push access to.
    
    Test Plan: validate
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, bgamari, mzero
    
    Differential Revision: https://phabricator.haskell.org/D1036


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

889c81c657b5719a8f4091099b7bf186127e9f53
 testsuite/tests/th/T10019.script | 9 +--------
 testsuite/tests/th/T10019.stdout | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/testsuite/tests/th/T10019.script b/testsuite/tests/th/T10019.script
index 97ecbe1..bb3d0d4 100644
--- a/testsuite/tests/th/T10019.script
+++ b/testsuite/tests/th/T10019.script
@@ -1,11 +1,4 @@
 :set -XTemplateHaskell
 import Language.Haskell.TH
 data Option a = Some a | None
-$(reify 'Some >>= litE . integerL . toInteger . length . show)
--- By taking the length we avoid wobbling when the exact uniques
--- chosen by TH change
---
--- This was the original
--- $(reify 'Some >>= stringE . show)
--- which yields
--- "DataConI Ghci1.Some (ForallT [KindedTV a_1627391549 StarT] [] (AppT (AppT ArrowT (VarT a_1627391549)) (AppT (ConT Ghci1.Option) (VarT a_1627391549)))) Ghci1.Option (Fixity 9 InfixL)"
\ No newline at end of file
+$(reify 'Some >>= stringE . pprint)
diff --git a/testsuite/tests/th/T10019.stdout b/testsuite/tests/th/T10019.stdout
index d65e8e3..e079405 100644
--- a/testsuite/tests/th/T10019.stdout
+++ b/testsuite/tests/th/T10019.stdout
@@ -1 +1 @@
-181
+"Constructor from Ghci1.Option: Ghci1.Some :: forall (a_0 :: *) . a_0 ->\n                                                                 Ghci1.Option a_0"