diff options
| author | Austin Seipp <austin@well-typed.com> | 2015-05-14 10:55:03 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2015-05-14 10:55:03 -0500 |
| commit | 3cf8ecdc70cb295a2b9606080a1c7b5fa8eb16f4 (patch) | |
| tree | e7989a081754885163e9dc20a6545820ebeab532 /testsuite/tests/module | |
| parent | 04a484eafc9eb9f8774b4bdd41a5dc6c9f640daf (diff) | |
| download | haskell-3cf8ecdc70cb295a2b9606080a1c7b5fa8eb16f4.tar.gz | |
Revert multiple commits
This reverts multiple commits from Simon:
- 04a484eafc9eb9f8774b4bdd41a5dc6c9f640daf Test Trac #10359
- a9ccd37add8315e061c02e5bf26c08f05fad9ac9 Test Trac #10403
- c0aae6f699cbd222d826d0b8d78d6cb3f682079e Test Trac #10248
- eb6ca851f553262efe0824b8dcbe64952de4963d Make the "matchable-given" check happen first
- ca173aa30467a0b1023682d573fcd94244d85c50 Add a case to checkValidTyCon
- 51cbad15f86fca1d1b0e777199eb1079a1b64d74 Update haddock submodule
- 6e1174da5b8e0b296f5bfc8b39904300d04eb5b7 Separate transCloVarSet from fixVarSet
- a8493e03b89f3b3bfcdb6005795de050501f5c29 Fix imports in HscMain (stage2)
- a154944bf07b2e13175519bafebd5a03926bf105 Two wibbles to fix the build
- 5910a1bc8142b4e56a19abea104263d7bb5c5d3f Change in capitalisation of error msg
- 130e93aab220bdf14d08028771f83df210da340b Refactor tuple constraints
- 8da785d59f5989b9a9df06386d5bd13f65435bc0 Delete commented-out line
These break the build by causing Haddock to fail mysteriously when
trying to examine GHC.Prim it seems.
Diffstat (limited to 'testsuite/tests/module')
| -rw-r--r-- | testsuite/tests/module/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/module/mod89.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/module/mod89.stderr | 12 |
3 files changed, 3 insertions, 13 deletions
diff --git a/testsuite/tests/module/all.T b/testsuite/tests/module/all.T index d0b37aaa33..c4c2fffe57 100644 --- a/testsuite/tests/module/all.T +++ b/testsuite/tests/module/all.T @@ -116,7 +116,7 @@ test('mod85', normal, compile, ['']) test('mod86', normal, compile, ['']) test('mod87', normal, compile_fail, ['']) test('mod88', normal, compile_fail, ['']) -test('mod89', normal, compile, ['']) +test('mod89', normal, compile_fail, ['']) test('mod90', normal, compile_fail, ['']) test('mod91', normal, compile_fail, ['']) test('mod92', normal, compile, ['']) diff --git a/testsuite/tests/module/mod89.hs b/testsuite/tests/module/mod89.hs index 1e903a0125..2c48d65a16 100644 --- a/testsuite/tests/module/mod89.hs +++ b/testsuite/tests/module/mod89.hs @@ -1,5 +1,3 @@ -{-# OPTIONS_GHC -Wall #-} - -- !!! Sublist for non-class/tycon module M where import Prelude(map(..)) diff --git a/testsuite/tests/module/mod89.stderr b/testsuite/tests/module/mod89.stderr index b355f3050b..0f956536cb 100644 --- a/testsuite/tests/module/mod89.stderr +++ b/testsuite/tests/module/mod89.stderr @@ -1,10 +1,2 @@ -
-mod89.hs:5:1: warning:
- The import item ‘map(..)’ suggests that
- ‘map’ has (in-scope) constructors or class methods,
- but it has none
-
-mod89.hs:5:1: warning:
- The import of ‘Prelude’ is redundant
- except perhaps to import instances from ‘Prelude’
- To import instances alone, use: import Prelude()
+ +mod89.hs:3:16: Module ‘Prelude’ does not export ‘map(..)’ |