summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--testsuite/tests/ghci/scripts/T5564.stderr2
-rw-r--r--testsuite/tests/th/T5508.stderr3
-rw-r--r--testsuite/tests/th/T5795.stderr3
-rw-r--r--testsuite/tests/th/T5971.stderr3
-rw-r--r--testsuite/tests/th/T8412.stderr3
-rw-r--r--testsuite/tests/th/TH_unresolvedInfix2.stderr2
6 files changed, 8 insertions, 8 deletions
diff --git a/testsuite/tests/ghci/scripts/T5564.stderr b/testsuite/tests/ghci/scripts/T5564.stderr
index 6fb94e4f13..e24eacf5c7 100644
--- a/testsuite/tests/ghci/scripts/T5564.stderr
+++ b/testsuite/tests/ghci/scripts/T5564.stderr
@@ -6,4 +6,4 @@
<interactive>:5:1:
Not in scope: ‛fit’
Perhaps you meant one of these:
- ‛it’ (line 4), ‛fst’ (imported from Prelude)
+ ‛fst’ (imported from Prelude), ‛it’ (line 4)
diff --git a/testsuite/tests/th/T5508.stderr b/testsuite/tests/th/T5508.stderr
index ff0383da7a..f1a553a02b 100644
--- a/testsuite/tests/th/T5508.stderr
+++ b/testsuite/tests/th/T5508.stderr
@@ -1,6 +1,7 @@
T5508.hs:(7,9)-(9,28): Splicing expression
do { let x = mkName "x"
v = return (LamE [VarP x] $ VarE x);
- [| $v . id |] }
+ [| $v . id |]
+ pending(rn) [(splice, v)] }
======>
((\ x -> x) . id)
diff --git a/testsuite/tests/th/T5795.stderr b/testsuite/tests/th/T5795.stderr
index dd909f14ee..70934924d0 100644
--- a/testsuite/tests/th/T5795.stderr
+++ b/testsuite/tests/th/T5795.stderr
@@ -3,4 +3,5 @@ T5795.hs:9:6:
GHC stage restriction:
‛ty’ is used in a top-level splice or annotation,
and must be imported, not defined locally
- In the expression: ty
+ In the splice: $ty
+ To see what the splice expanded to, use -ddump-splices
diff --git a/testsuite/tests/th/T5971.stderr b/testsuite/tests/th/T5971.stderr
index 16eb00a051..e6538c0b2f 100644
--- a/testsuite/tests/th/T5971.stderr
+++ b/testsuite/tests/th/T5971.stderr
@@ -4,7 +4,6 @@ T5971.hs:6:7:
Probable cause: you used a unique Template Haskell name (NameU),
perhaps via newName, but did not bind it
If that's it, then -ddump-splices might be useful
- In the result of the splice:
- $(newName "x" >>= varE)
+ In the splice: $(newName "x" >>= varE)
To see what the splice expanded to, use -ddump-splices
In the expression: $(newName "x" >>= varE)
diff --git a/testsuite/tests/th/T8412.stderr b/testsuite/tests/th/T8412.stderr
index 21d43e472f..8def7843d5 100644
--- a/testsuite/tests/th/T8412.stderr
+++ b/testsuite/tests/th/T8412.stderr
@@ -1,6 +1,5 @@
T8412.hs:5:12:
Illegal literal in type (type literals must not be negative): -1
- In the result of the splice:
- $(return $ LitT $ NumTyLit (- 1))
+ In the splice: $(return $ LitT $ NumTyLit (- 1))
To see what the splice expanded to, use -ddump-splices
diff --git a/testsuite/tests/th/TH_unresolvedInfix2.stderr b/testsuite/tests/th/TH_unresolvedInfix2.stderr
index 31f06058da..30b1aa4844 100644
--- a/testsuite/tests/th/TH_unresolvedInfix2.stderr
+++ b/testsuite/tests/th/TH_unresolvedInfix2.stderr
@@ -4,7 +4,7 @@ TH_unresolvedInfix2.hs:14:11:
must have lower precedence than that of the operand,
namely ‛:+’ [infixl 6]
in the section: ‛:+ N :+ N’
- In the result of the splice:
+ In the splice:
$(let
plus = conE ':+
n = conE 'N