remove CPP for some imports and foldable methods

L0neGamer · L0neGamer · commit 9d7f203cf003 · 2026-04-04T14:39:44.000+01:00
diff --git a/Control/Applicative/Backwards.hs b/Control/Applicative/Backwards.hs
@@ -34,9 +34,7 @@ import GHC.Generics
 import Prelude hiding (foldr, foldr1, foldl, foldl1, null, length)
 import Control.Applicative
 import Data.Foldable
-#if !(MIN_VERSION_base(4,8,0)) || defined(__MHS__)
 import Data.Traversable (Traversable(traverse, sequenceA))
-#endif
 
 -- | The same functor, but with an 'Applicative' instance that performs
 -- actions in the reverse order.
@@ -107,10 +105,8 @@ instance (Foldable f) => Foldable (Backwards f) where
     {-# INLINE foldr1 #-}
     foldl1 f (Backwards t) = foldl1 f t
     {-# INLINE foldl1 #-}
-#if MIN_VERSION_base(4,8,0)
     null (Backwards t) = null t
     length (Backwards t) = length t
-#endif
 
 #if MIN_VERSION_base(4,18,0)
 -- | Derived instance.
diff --git a/Control/Applicative/Lift.hs b/Control/Applicative/Lift.hs
@@ -37,11 +37,9 @@ import Data.Functor.Classes
 
 import Control.Applicative
 import Data.Functor.Constant
-#if !(MIN_VERSION_base(4,8,0)) || defined(__MHS__)
 import Data.Foldable (Foldable(foldMap))
 import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
-#endif
 #ifdef GENERICS
 import GHC.Generics
 #endif
diff --git a/Control/Monad/Trans/Accum.hs b/Control/Monad/Trans/Accum.hs
@@ -64,9 +64,7 @@ import qualified Control.Monad.Fail as Fail
 #endif
 import Control.Monad.Fix
 import Control.Monad.Signatures
-#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid
-#endif
 #ifdef GENERICS
 import GHC.Generics
 #endif
diff --git a/Control/Monad/Trans/Cont.hs b/Control/Monad/Trans/Cont.hs
@@ -46,9 +46,7 @@ import Control.Monad.IO.Class
 import Control.Monad.Trans.Class
 import Data.Functor.Identity
 
-#if !(MIN_VERSION_base(4,8,0))
 import Control.Applicative
-#endif
 #if MIN_VERSION_base(4,9,0)
 import qualified Control.Monad.Fail as Fail
 #endif
diff --git a/Control/Monad/Trans/Except.hs b/Control/Monad/Trans/Except.hs
@@ -63,11 +63,9 @@ import qualified Control.Monad.Fail as Fail
 #endif
 import Control.Monad.Fix
 import Control.Monad.Zip (MonadZip(mzipWith))
-#if !(MIN_VERSION_base(4,8,0)) || defined(__MHS__)
 import Data.Foldable (Foldable(foldMap))
 import Data.Monoid (Monoid(mempty, mappend))
 import Data.Traversable (Traversable(traverse))
-#endif
 #ifdef GENERICS
 import GHC.Generics
 #endif
diff --git a/Control/Monad/Trans/Identity.hs b/Control/Monad/Trans/Identity.hs
@@ -45,9 +45,7 @@ import qualified Control.Monad.Fail as Fail
 import Control.Monad.Fix (MonadFix(mfix))
 import Control.Monad.Zip (MonadZip(mzipWith))
 import Data.Foldable
-#if !(MIN_VERSION_base(4,8,0)) || defined(__MHS__)
 import Data.Traversable (Traversable(traverse))
-#endif
 import Prelude hiding (foldr, foldr1, foldl, foldl1, null, length)
 #ifdef GENERICS
 import GHC.Generics
@@ -95,10 +93,8 @@ instance (Foldable f) => Foldable (IdentityT f) where
     {-# INLINE foldr1 #-}
     foldl1 f (IdentityT t) = foldl1 f t
     {-# INLINE foldl1 #-}
-#if MIN_VERSION_base(4,8,0)
     null (IdentityT t) = null t
     length (IdentityT t) = length t
-#endif
 
 #if MIN_VERSION_base(4,18,0)
 instance (Foldable1 m) => Foldable1 (IdentityT m) where
diff --git a/Control/Monad/Trans/Maybe.hs b/Control/Monad/Trans/Maybe.hs
@@ -54,10 +54,8 @@ import qualified Control.Monad.Fail as Fail
 import Control.Monad.Fix (MonadFix(mfix))
 import Control.Monad.Zip (MonadZip(mzipWith))
 import Data.Maybe (fromMaybe)
-#if !(MIN_VERSION_base(4,8,0)) || defined(__MHS__)
 import Data.Foldable (Foldable(foldMap))
 import Data.Traversable (Traversable(traverse))
-#endif
 #ifdef GENERICS
 import GHC.Generics
 #endif
diff --git a/Control/Monad/Trans/RWS/CPS.hs b/Control/Monad/Trans/RWS/CPS.hs
@@ -71,9 +71,7 @@ import Control.Monad.Trans.Class
 import Control.Monad.Signatures
 import Data.Functor.Identity
 
-#if !(MIN_VERSION_base(4,8,0))
 import Data.Monoid
-#endif
 
 #if MIN_VERSION_base(4,9,0)
 import qualified Control.Monad.Fail as Fail
diff --git a/Control/Monad/Trans/RWS/Lazy.hs b/Control/Monad/Trans/RWS/Lazy.hs
@@ -72,9 +72,7 @@ import Control.Monad
 import qualified Control.Monad.Fail as Fail
 #endif
 import Control.Monad.Fix
-#if !(MIN_VERSION_base(4,8,0))
 import Data.Monoid
-#endif
 #ifdef GENERICS
 import GHC.Generics
 #endif
diff --git a/Control/Monad/Trans/RWS/Strict.hs b/Control/Monad/Trans/RWS/Strict.hs
@@ -75,9 +75,7 @@ import Control.Monad
 import qualified Control.Monad.Fail as Fail
 #endif
 import Control.Monad.Fix
-#if !(MIN_VERSION_base(4,8,0))
 import Data.Monoid
-#endif
 #ifdef GENERICS
 import GHC.Generics
 #endif
diff --git a/Control/Monad/Trans/Writer/CPS.hs b/Control/Monad/Trans/Writer/CPS.hs
@@ -57,9 +57,7 @@ import Control.Monad.Trans.Class
 import Control.Monad.Signatures
 import Data.Functor.Identity
 
-#if !(MIN_VERSION_base(4,8,0))
 import Data.Monoid
-#endif
 
 #if MIN_VERSION_base(4,9,0)
 import qualified Control.Monad.Fail as Fail
diff --git a/Control/Monad/Trans/Writer/Lazy.hs b/Control/Monad/Trans/Writer/Lazy.hs
@@ -63,9 +63,7 @@ import Control.Monad.Signatures
 import Control.Monad.Zip (MonadZip(mzipWith))
 import Data.Foldable
 import Data.Monoid
-#if !(MIN_VERSION_base(4,8,0)) || defined(__MHS__)
 import Data.Traversable (Traversable(traverse))
-#endif
 import Prelude hiding (null, length)
 #ifdef GENERICS
 import GHC.Generics
@@ -181,10 +179,8 @@ instance (Functor m) => Functor (WriterT w m) where
 instance (Foldable f) => Foldable (WriterT w f) where
     foldMap f = foldMap (f . fst) . runWriterT
     {-# INLINE foldMap #-}
-#if MIN_VERSION_base(4,8,0)
     null (WriterT t) = null t
     length (WriterT t) = length t
-#endif
 
 instance (Traversable f) => Traversable (WriterT w f) where
     traverse f = fmap WriterT . traverse f' . runWriterT where
diff --git a/Control/Monad/Trans/Writer/Strict.hs b/Control/Monad/Trans/Writer/Strict.hs
@@ -66,9 +66,7 @@ import Control.Monad.Signatures
 import Control.Monad.Zip (MonadZip(mzipWith))
 import Data.Foldable
 import Data.Monoid
-#if !(MIN_VERSION_base(4,8,0)) || defined(__MHS__)
 import Data.Traversable (Traversable(traverse))
-#endif
 import Prelude hiding (null, length)
 #ifdef GENERICS
 import GHC.Generics
@@ -184,10 +182,8 @@ instance (Functor m) => Functor (WriterT w m) where
 instance (Foldable f) => Foldable (WriterT w f) where
     foldMap f = foldMap (f . fst) . runWriterT
     {-# INLINE foldMap #-}
-#if MIN_VERSION_base(4,8,0)
     null (WriterT t) = null t
     length (WriterT t) = length t
-#endif
 
 instance (Traversable f) => Traversable (WriterT w f) where
     traverse f = fmap WriterT . traverse f' . runWriterT where
diff --git a/Data/Functor/Constant.hs b/Data/Functor/Constant.hs
@@ -29,13 +29,9 @@ import Data.Functor.Contravariant
 
 import Control.Applicative
 import Data.Foldable
-#if !(MIN_VERSION_base(4,8,0)) || defined(__MHS__)
 import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
-#endif
-#if MIN_VERSION_base(4,8,0)
 import Data.Bifunctor (Bifunctor(..))
-#endif
 #if (MIN_VERSION_base(4,9,0)) && !(MIN_VERSION_base(4,11,0))
 import Data.Semigroup (Semigroup((<>)))
 #endif
@@ -109,10 +105,8 @@ instance Functor (Constant a) where
 instance Foldable (Constant a) where
     foldMap _ (Constant _) = mempty
     {-# INLINE foldMap #-}
-#if MIN_VERSION_base(4,8,0)
     null (Constant _) = True
     length (Constant _) = 0
-#endif
 
 instance Traversable (Constant a) where
     traverse _ (Constant x) = pure (Constant x)
@@ -139,13 +133,11 @@ instance (Monoid a) => Monoid (Constant a b) where
     {-# INLINE mappend #-}
 #endif
 
-#if MIN_VERSION_base(4,8,0)
 instance Bifunctor Constant where
     first f (Constant x) = Constant (f x)
     {-# INLINE first #-}
     second _ (Constant x) = Constant x
     {-# INLINE second #-}
-#endif
 
 #if MIN_VERSION_base(4,10,0)
 instance Bifoldable Constant where
diff --git a/Data/Functor/Reverse.hs b/Data/Functor/Reverse.hs
@@ -36,9 +36,7 @@ import Control.Monad
 import qualified Control.Monad.Fail as Fail
 #endif
 import Data.Foldable
-#if !(MIN_VERSION_base(4,8,0)) || defined(__MHS__)
 import Data.Traversable (Traversable(traverse))
-#endif
 import Data.Monoid
 #ifdef GENERICS
 import GHC.Generics
@@ -129,10 +127,8 @@ instance (Foldable f) => Foldable (Reverse f) where
     {-# INLINE foldr1 #-}
     foldl1 f (Reverse t) = foldr1 (flip f) t
     {-# INLINE foldl1 #-}
-#if MIN_VERSION_base(4,8,0)
     null (Reverse t) = null t
     length (Reverse t) = length t
-#endif
 
 #if MIN_VERSION_base(4,18,0)
 -- | Fold from right to left.
