summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-11-20 22:21:06 -0600
committerAustin Seipp <austin@well-typed.com>2014-11-20 22:21:32 -0600
commite888b943396c21db74ba2fc69bf3a89e2473ea2b (patch)
tree2ff848d8c444877ef34ace40a298b973b2b208e1 /testsuite
parent86dda8f7adb887eb376a938dd48780e503b53a08 (diff)
downloadhaskell-e888b943396c21db74ba2fc69bf3a89e2473ea2b.tar.gz
Hide `Data.OldList` module
Summary: The `Data.OldList` module was originally created in 3daf0023d2dcf7caf85d61f2dc177f8e9421b2fd to provide a way to access the original list-specialised functions from `Data.List`. It was also made an exposed module in order to facilitate adapting the `haskell2010`/`haskell98` packages. However, since the `haskell2010`/`haskell98` packages were dropped, we no longer need to expose `Data.OldList`. Depends on D511 Reviewers: ekmett, austin Reviewed By: ekmett, austin Subscribers: thomie, carter Differential Revision: https://phabricator.haskell.org/D513
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/ghci/scripts/ghci008.stdout4
-rw-r--r--testsuite/tests/module/mod106.hs2
-rw-r--r--testsuite/tests/parser/should_fail/readFail003.hs2
-rw-r--r--testsuite/tests/rename/should_compile/T7963a.hs2
-rw-r--r--testsuite/tests/rename/should_fail/rnfail040.stderr2
-rw-r--r--testsuite/tests/simplCore/should_compile/T7360.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/faxen.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/mc21.hs4
-rw-r--r--testsuite/tests/typecheck/should_fail/mc24.hs4
9 files changed, 12 insertions, 12 deletions
diff --git a/testsuite/tests/ghci/scripts/ghci008.stdout b/testsuite/tests/ghci/scripts/ghci008.stdout
index 057e9b298a..9d9c26ecb1 100644
--- a/testsuite/tests/ghci/scripts/ghci008.stdout
+++ b/testsuite/tests/ghci/scripts/ghci008.stdout
@@ -32,5 +32,5 @@ class (RealFrac a, Floating a) => RealFloat a where
-- Defined in ‘GHC.Float’
instance RealFloat Float -- Defined in ‘GHC.Float’
instance RealFloat Double -- Defined in ‘GHC.Float’
-Data.OldList.isPrefixOf :: Eq a => [a] -> [a] -> Bool
- -- Defined in ‘Data.OldList’
+base-4.8.0.0:Data.OldList.isPrefixOf :: Eq a => [a] -> [a] -> Bool
+ -- Defined in ‘base-4.8.0.0:Data.OldList’
diff --git a/testsuite/tests/module/mod106.hs b/testsuite/tests/module/mod106.hs
index b5059714ec..7fae66d9b7 100644
--- a/testsuite/tests/module/mod106.hs
+++ b/testsuite/tests/module/mod106.hs
@@ -1,7 +1,7 @@
-- !!! local aliases
module M where
-import qualified Data.OldList as M
+import qualified GHC.List as M
import qualified Data.Maybe as M
x = M.length
diff --git a/testsuite/tests/parser/should_fail/readFail003.hs b/testsuite/tests/parser/should_fail/readFail003.hs
index 343e1f06e2..8a60e8eca4 100644
--- a/testsuite/tests/parser/should_fail/readFail003.hs
+++ b/testsuite/tests/parser/should_fail/readFail003.hs
@@ -1,6 +1,6 @@
-- !!! Irrefutable patterns + guards
module Read003 where
-import Data.OldList; import Prelude hiding (null)
+import GHC.List; import Prelude hiding (null)
~(a,b,c) | nullity b = a
| nullity c = a
| otherwise = a
diff --git a/testsuite/tests/rename/should_compile/T7963a.hs b/testsuite/tests/rename/should_compile/T7963a.hs
index fc8004d0ee..25ac408a39 100644
--- a/testsuite/tests/rename/should_compile/T7963a.hs
+++ b/testsuite/tests/rename/should_compile/T7963a.hs
@@ -1,7 +1,7 @@
module T7963a where
import Prelude ()
-import Data.OldList
+import GHC.List
unlines = concat
diff --git a/testsuite/tests/rename/should_fail/rnfail040.stderr b/testsuite/tests/rename/should_fail/rnfail040.stderr
index 80fad233b0..c3faa92fbd 100644
--- a/testsuite/tests/rename/should_fail/rnfail040.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail040.stderr
@@ -3,7 +3,7 @@ rnfail040.hs:7:12:
Conflicting exports for ‘nub’:
‘module M’ exports ‘M.nub’
imported from ‘Data.List’ at rnfail040.hs:10:2-22
- (and originally defined in ‘Data.OldList’)
+ (and originally defined in ‘base-4.8.0.0:Data.OldList’)
‘module M’ exports ‘T.nub’
imported from ‘Rnfail040_A’ at rnfail040.hs:11:2-24
(and originally defined at Rnfail040_A.hs:2:3-5)
diff --git a/testsuite/tests/simplCore/should_compile/T7360.hs b/testsuite/tests/simplCore/should_compile/T7360.hs
index 67c5e7212b..4e4703c210 100644
--- a/testsuite/tests/simplCore/should_compile/T7360.hs
+++ b/testsuite/tests/simplCore/should_compile/T7360.hs
@@ -3,7 +3,7 @@
module T7360 where
-import Data.OldList as L
+import GHC.List as L
data Foo = Foo1 | Foo2 | Foo3 !Int
diff --git a/testsuite/tests/typecheck/should_compile/faxen.hs b/testsuite/tests/typecheck/should_compile/faxen.hs
index f65ee7159a..8ad56c65a4 100644
--- a/testsuite/tests/typecheck/should_compile/faxen.hs
+++ b/testsuite/tests/typecheck/should_compile/faxen.hs
@@ -6,7 +6,7 @@
module ShouldCompile where
-import Data.OldList (null)
+import GHC.List (null)
import Prelude hiding (null)
class HasEmpty a where
diff --git a/testsuite/tests/typecheck/should_fail/mc21.hs b/testsuite/tests/typecheck/should_fail/mc21.hs
index adb4b91204..8c13a66300 100644
--- a/testsuite/tests/typecheck/should_fail/mc21.hs
+++ b/testsuite/tests/typecheck/should_fail/mc21.hs
@@ -3,11 +3,11 @@
{-# OPTIONS_GHC -XMonadComprehensions -XTransformListComp #-}
module ShouldFail where
import GHC.Exts( the )
-import Data.OldList
+import GHC.List
data Unorderable = Gnorf | Pinky | Brain
-foo = [ Data.OldList.length x
+foo = [ GHC.List.length x
| x <- [Gnorf, Brain]
, then group using take 5
]
diff --git a/testsuite/tests/typecheck/should_fail/mc24.hs b/testsuite/tests/typecheck/should_fail/mc24.hs
index 281f4ad99a..e5d8099c52 100644
--- a/testsuite/tests/typecheck/should_fail/mc24.hs
+++ b/testsuite/tests/typecheck/should_fail/mc24.hs
@@ -3,9 +3,9 @@
{-# OPTIONS_GHC -XMonadComprehensions -XTransformListComp #-}
module ShouldFail where
-import Data.OldList
+import GHC.List
-foo = [ Data.OldList.length x
+foo = [ GHC.List.length x
| x <- [1..10]
, then group by x using take 2
]