summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Zimmerman <alan.zimm@gmail.com>2015-05-08 19:01:43 +0200
committerAlan Zimmerman <alan.zimm@gmail.com>2015-05-08 19:01:43 +0200
commit3aca63a3e31078246c111fbf385cf0fb84e5ff04 (patch)
tree64fd3867c8cafac8fdb4a10755a323de45eda734
parentbd2bfe29480fe3f845bea1fafd1d9787cc14eed8 (diff)
downloadhaskell-wip/7.10-api-annots.tar.gz
Fix failing API Annotations tests from master cherry pickwip/7.10-api-annots
-rw-r--r--testsuite/tests/ghc-api/annotations/T10268.stderr9
-rw-r--r--testsuite/tests/ghc-api/annotations/T10312.stderr6
2 files changed, 11 insertions, 4 deletions
diff --git a/testsuite/tests/ghc-api/annotations/T10268.stderr b/testsuite/tests/ghc-api/annotations/T10268.stderr
index de983a26bf..0fe04270ed 100644
--- a/testsuite/tests/ghc-api/annotations/T10268.stderr
+++ b/testsuite/tests/ghc-api/annotations/T10268.stderr
@@ -1,7 +1,14 @@
Test10268.hs:5:6:
Not in scope: ‘footemplate’
- In the untyped splice: $footemplate
+ In the splice: $footemplate
+
+Test10268.hs:5:6:
+ GHC stage restriction:
+ ‘footemplate’ is used in a top-level splice or annotation,
+ and must be imported, not defined locally
+ In the expression: footemplate
+ In the splice: $footemplate
Test10268.hs:7:14:
Not in scope: type constructor or class ‘Pattern’
diff --git a/testsuite/tests/ghc-api/annotations/T10312.stderr b/testsuite/tests/ghc-api/annotations/T10312.stderr
index 08f3bec6cf..939823c1cb 100644
--- a/testsuite/tests/ghc-api/annotations/T10312.stderr
+++ b/testsuite/tests/ghc-api/annotations/T10312.stderr
@@ -1,8 +1,8 @@
-Test10312.hs:77:38: error: Not in scope: data constructor ‘Fixity’
+Test10312.hs:77:38: Not in scope: data constructor ‘Fixity’
-Test10312.hs:77:53: error:
+Test10312.hs:77:53:
Not in scope: ‘fs’
Perhaps you meant ‘fst’ (imported from Prelude)
-Test10312.hs:78:47: error: Not in scope: ‘ppDir’
+Test10312.hs:78:47: Not in scope: ‘ppDir’