Drop dead code for witherable < 0.4

Author: alexfmpe

src/Data/AppendMap.hs

@@ -30,10 +30,7 @@ import qualified Data.Map.Internal.Debug as Map (showTree, showTreeWith)
 #else
 import qualified Data.Map as Map (showTree, showTreeWith)
 #endif
-#if !MIN_VERSION_witherable(0,3,2)
-import qualified Data.Witherable as W
-import qualified Data.Map.Monoidal as MonoidalMap
-#endif
+
 import Data.Map.Monoidal
 
 
@@ -50,11 +47,6 @@ _unAppendMap = getMonoidalMap
 pattern AppendMap :: Map k v -> MonoidalMap k v
 pattern AppendMap m = MonoidalMap m
 
-#if !MIN_VERSION_witherable(0,3,2)
-instance W.Filterable (MonoidalMap k) where
-  mapMaybe = MonoidalMap.mapMaybe
-#endif
-
 -- | Deletes a key, returning 'Nothing' if the result is empty.
 nonEmptyDelete :: Ord k => k -> MonoidalMap k a -> Maybe (MonoidalMap k a)
 nonEmptyDelete k vs =

src/Reflex/Class.hs

@@ -219,17 +219,12 @@ import Data.String
 import Data.These
 import Data.Type.Coercion
 import Data.Type.Equality ((:~:) (..))
-#if MIN_VERSION_witherable(0,4,0)
-import Witherable (Filterable(..))
-import qualified Witherable as W
-#else
-import Data.Witherable (Filterable(..))
-import qualified Data.Witherable as W
-#endif
 import Reflex.FunctorMaybe (FunctorMaybe)
 import qualified Reflex.FunctorMaybe
 import Data.Patch
 import qualified Data.Patch.MapWithMove as PatchMapWithMove
+import Witherable (Filterable(..))
+import qualified Witherable as W
 
 import Debug.Trace (trace)
 

src/Reflex/FunctorMaybe.hs

@@ -19,11 +19,7 @@ import Data.Map (Map)
 #if !MIN_VERSION_base(4,16,0)
 import Data.Semigroup (Option(..))
 #endif
-#if MIN_VERSION_witherable(0,4,0)
 import Witherable
-#else
-import Data.Witherable
-#endif
 
 --TODO: See if there's a better class in the standard libraries already
 

src/Reflex/Spider/Internal.hs

@@ -69,18 +69,14 @@ import Data.Proxy
 import Data.These
 import Data.Traversable
 import Data.Type.Equality ((:~:)(Refl))
-#if MIN_VERSION_witherable(0,4,0)
-import Witherable (Filterable, mapMaybe)
-#else
-import Data.Witherable (Filterable, mapMaybe)
-#endif
 import GHC.Exts hiding (toList)
 import GHC.IORef (IORef (..))
 import GHC.Stack
 import Reflex.FastWeak
 import System.IO.Unsafe
 import System.Mem.Weak
 import Unsafe.Coerce
+import Witherable (Filterable, mapMaybe)
 
 #ifdef MIN_VERSION_semialign
 #if MIN_VERSION_these(0,8,0)

test/DebugCycles.hs

@@ -29,7 +29,7 @@ import Reflex.EventWriter.Base
 import Test.Run
 import Test.Hspec
 import Reflex.Spider.Internal (EventLoopException)
-import Data.Witherable (Filterable)
+import Witherable (Filterable)
 
 #if defined(MIN_VERSION_these_lens) || (MIN_VERSION_these(0,8,0) && !MIN_VERSION_these(0,9,0))
 import Data.These.Lens