diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-09-20 23:32:06 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-09-20 23:38:30 +0200 |
| commit | 3daf0023d2dcf7caf85d61f2dc177f8e9421b2fd (patch) | |
| tree | 6113afd5ee72e2e7b112e076230d9af5cc97c54d /testsuite | |
| parent | 9f7e3633c692dce75c27607131bd386178fb0fcf (diff) | |
| download | haskell-3daf0023d2dcf7caf85d61f2dc177f8e9421b2fd.tar.gz | |
Set up framework for generalising Data.List to Foldables
This renames the Data.List module to Data.OldList, and puts a new
Data.List module into its place re-exporting all list functions.
The plan is to leave the monomorphic versions of the list functions in
Data.OldList to help smooth the transition.
The new Data.List module then will simply re-export entities from
Data.OldList and Data.Foldable.
This refactoring has been placed in a separate commit to be able to
better isolate any regressions caused by the actual list function
generalisations when implementing #9586
This also updates the haskell2010, haskell98, and array submodules
Reviewed By: austin, ekmett
Differential Revision: https://phabricator.haskell.org/D228
Diffstat (limited to 'testsuite')
5 files changed, 8 insertions, 3 deletions
diff --git a/testsuite/tests/ghci/scripts/ghci008.stdout b/testsuite/tests/ghci/scripts/ghci008.stdout index f0a3f19a9c..057e9b298a 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.List.isPrefixOf :: Eq a => [a] -> [a] -> Bool - -- Defined in ‘Data.List’ +Data.OldList.isPrefixOf :: Eq a => [a] -> [a] -> Bool + -- Defined in ‘Data.OldList’ diff --git a/testsuite/tests/lib/integer/integerGmpInternals.hs b/testsuite/tests/lib/integer/integerGmpInternals.hs index 1cbad60b7b..3abb14031a 100644 --- a/testsuite/tests/lib/integer/integerGmpInternals.hs +++ b/testsuite/tests/lib/integer/integerGmpInternals.hs @@ -160,4 +160,4 @@ main = do roll :: [Word8] -> Integer - roll = foldr (\b a -> a `shiftL` 8 .|. fromIntegral b) 0 + roll = GHC.Base.foldr (\b a -> a `shiftL` 8 .|. fromIntegral b) 0 diff --git a/testsuite/tests/rename/should_compile/T1972.stderr b/testsuite/tests/rename/should_compile/T1972.stderr index e8e8f39a6b..38f013e222 100644 --- a/testsuite/tests/rename/should_compile/T1972.stderr +++ b/testsuite/tests/rename/should_compile/T1972.stderr @@ -7,5 +7,6 @@ T1972.hs:14:3: Warning: This binding for ‘mapAccumL’ shadows the existing bindings defined at T1972.hs:16:1 imported from ‘Data.List’ at T1972.hs:7:1-16 + (and originally defined in ‘Data.OldList’) T1972.hs:20:10: Warning: Defined but not used: ‘c’ diff --git a/testsuite/tests/rename/should_compile/T7963a.hs b/testsuite/tests/rename/should_compile/T7963a.hs index 2a21a18181..fc8004d0ee 100644 --- a/testsuite/tests/rename/should_compile/T7963a.hs +++ b/testsuite/tests/rename/should_compile/T7963a.hs @@ -1,4 +1,7 @@ module T7963a where +import Prelude () +import Data.OldList + unlines = concat diff --git a/testsuite/tests/rename/should_fail/rnfail040.stderr b/testsuite/tests/rename/should_fail/rnfail040.stderr index 38ffb08b60..80fad233b0 100644 --- a/testsuite/tests/rename/should_fail/rnfail040.stderr +++ b/testsuite/tests/rename/should_fail/rnfail040.stderr @@ -3,6 +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’) ‘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) |