From 720b6b1ab08655aa90c5454eefdcc5b4fa6e442b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 11:43:47 +0200 Subject: [PATCH] Future-proof against potential Prelude.foldl' (backport #8960) (#9265) Co-authored-by: Bodigrim --- Cabal-syntax/src/Distribution/Compat/Prelude.hs | 6 +++--- Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cabal-syntax/src/Distribution/Compat/Prelude.hs b/Cabal-syntax/src/Distribution/Compat/Prelude.hs index 4c820e73c..51a32f912 100644 --- a/Cabal-syntax/src/Distribution/Compat/Prelude.hs +++ b/Cabal-syntax/src/Distribution/Compat/Prelude.hs @@ -130,10 +130,9 @@ module Distribution.Compat.Prelude ( -- We also could hide few partial function import Prelude as BasePrelude hiding - ( mapM, mapM_, sequence, null, length, foldr, any, all, head, tail, last, init + ( mapM, mapM_, sequence, any, all, head, tail, last, init -- partial functions , read - , foldr1, foldl1 #if MINVER_base_411 -- As of base 4.11.0.0 Prelude exports part of Semigroup(..). -- Hide this so we instead rely on Distribution.Compat.Semigroup. @@ -142,8 +141,9 @@ import Prelude as BasePrelude hiding , Word -- We hide them, as we import only some members , Traversable, traverse, sequenceA - , Foldable, foldMap + , Foldable(..) ) +import Data.Foldable as BasePrelude (foldl, elem, sum, product, maximum, minimum) -- AMP import Data.Foldable diff --git a/Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs index 44efa858a..c2180b630 100644 --- a/Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs +++ b/Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs @@ -5,8 +5,9 @@ #endif module UnitTests.Distribution.Utils.CharSet where +import Prelude hiding (Foldable(..)) import Data.Char (isAlpha, isAlphaNum) -import Data.List (foldl') +import Data.Foldable (foldl') import Test.Tasty (TestTree, testGroup) import Test.Tasty.HUnit (testCase, (@?=)) -- 2.11.4.GIT