From 05cf18f883bf2d49b53a1d25cb57eff3333eb0c9 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Sat, 20 Sep 2014 23:50:06 +0200 Subject: Generalise (some of) Data.List to Foldables (re #9568) This replaces the entities in Data.List conflicting with Data.Foldable with re-exports of the generalised version from Data.Foldable. As of this commit, the following compiles w/o error module XPrelude (module X) where import Control.Monad as X import Data.Foldable as X import Data.List as X import Prelude as X Reviewed By: austin, dfeuer, ekmett Differential Revision: https://phabricator.haskell.org/D229 --- testsuite/tests/rename/should_fail/rnfail032.stderr | 4 ++-- testsuite/tests/rename/should_fail/rnfail033.stderr | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'testsuite/tests') diff --git a/testsuite/tests/rename/should_fail/rnfail032.stderr b/testsuite/tests/rename/should_fail/rnfail032.stderr index 8a2bf0c4d1..2169fd502e 100644 --- a/testsuite/tests/rename/should_fail/rnfail032.stderr +++ b/testsuite/tests/rename/should_fail/rnfail032.stderr @@ -3,5 +3,5 @@ rnfail032.hs:2:21: Not in scope: ‘Data.List.map’ Perhaps you meant one of these: ‘Data.List.zip’ (imported from Data.List), - ‘Data.List.sum’ (imported from Data.List), - ‘Data.List.all’ (imported from Data.List) + ‘Data.List.all’ (imported from Data.List), + ‘Data.List.and’ (imported from Data.List) diff --git a/testsuite/tests/rename/should_fail/rnfail033.stderr b/testsuite/tests/rename/should_fail/rnfail033.stderr index 9e95a85e53..6b6849d1e5 100644 --- a/testsuite/tests/rename/should_fail/rnfail033.stderr +++ b/testsuite/tests/rename/should_fail/rnfail033.stderr @@ -3,5 +3,5 @@ rnfail033.hs:2:21: Not in scope: ‘Data.List.map’ Perhaps you meant one of these: ‘Data.List.zip’ (imported from Data.List), - ‘Data.List.sum’ (imported from Data.List), - ‘Data.List.all’ (imported from Data.List) + ‘Data.List.all’ (imported from Data.List), + ‘Data.List.and’ (imported from Data.List) -- cgit v1.2.1