From 93790bbc33c2568d442426d15e8f99ea4fe45217 Mon Sep 17 00:00:00 2001
From: Richard Eisenberg <eir@cis.upenn.edu>
Date: Sat, 4 Jul 2015 09:35:14 +0200
Subject: [PATCH] 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
---
testsuite/tests/th/T10019.script | 2 +-
testsuite/tests/th/T10019.stdout | 2 +-
.../tests/typecheck/should_fail/T10534.stderr | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/testsuite/tests/th/T10019.script b/testsuite/tests/th/T10019.script
index eef5fe74b226..bb3d0d464eac 100644
--- a/testsuite/tests/th/T10019.script
+++ b/testsuite/tests/th/T10019.script
@@ -1,4 +1,4 @@
:set -XTemplateHaskell
import Language.Haskell.TH
data Option a = Some a | None
-$(reify 'Some >>= stringE . show)
+$(reify 'Some >>= stringE . pprint)
diff --git a/testsuite/tests/th/T10019.stdout b/testsuite/tests/th/T10019.stdout
index 63459303dde7..e0794053094e 100644
--- a/testsuite/tests/th/T10019.stdout
+++ b/testsuite/tests/th/T10019.stdout
@@ -1 +1 @@
-"DataConI Ghci1.Some (ForallT [KindedTV a_1627391544 StarT] [] (AppT (AppT ArrowT (VarT a_1627391544)) (AppT (ConT Ghci1.Option) (VarT a_1627391544)))) Ghci1.Option (Fixity 9 InfixL)"
+"Constructor from Ghci1.Option: Ghci1.Some :: forall (a_0 :: *) . a_0 ->\n Ghci1.Option a_0"
diff --git a/testsuite/tests/typecheck/should_fail/T10534.stderr b/testsuite/tests/typecheck/should_fail/T10534.stderr
index 5f44426b5c66..5053d7168ddd 100644
--- a/testsuite/tests/typecheck/should_fail/T10534.stderr
+++ b/testsuite/tests/typecheck/should_fail/T10534.stderr
@@ -1,15 +1,15 @@
-T10534a.hs:9:10: error:
- Could not deduce: a ~ b
- from the context: Coercible (DF a) (DF b)
- bound by the type signature for:
- silly :: Coercible (DF a) (DF b) => a -> b
+T10534a.hs:9:10:
+ Could not deduce (a ~ b)
+ from the context (Coercible (DF a) (DF b))
+ bound by the type signature for
+ silly :: Coercible (DF a) (DF b) => a -> b
at T10534a.hs:9:10-42
‘a’ is a rigid type variable bound by
- the type signature for: silly :: Coercible (DF a) (DF b) => a -> b
+ the type signature for silly :: Coercible (DF a) (DF b) => a -> b
at T10534a.hs:9:10
‘b’ is a rigid type variable bound by
- the type signature for: silly :: Coercible (DF a) (DF b) => a -> b
+ the type signature for silly :: Coercible (DF a) (DF b) => a -> b
at T10534a.hs:9:10
arising from trying to show that the representations of
‘DF a’ and
--
GitLab