Fix warnings

Author: Ericson2314

src/Data/Functor/Misc.hs

@@ -41,7 +41,6 @@ module Data.Functor.Misc
   , ComposeMaybe (..)
   ) where
 
-import Control.Applicative ((<$>))
 import Data.Dependent.Map (DMap)
 import qualified Data.Dependent.Map as DMap
 import Data.Dependent.Sum

src/Data/Patch.hs

@@ -13,7 +13,7 @@ module Data.Patch
   , module X
   ) where
 
-import Control.Applicative
+import Control.Applicative (liftA2)
 import Data.Functor.Const (Const (..))
 import Data.Functor.Identity
 import Data.Map.Monoidal (MonoidalMap)

src/Data/Patch/IntMap.hs

@@ -15,7 +15,9 @@ Patches of this sort allow for insert/update or delete of associations.
 module Data.Patch.IntMap where
 
 import Control.Lens hiding  (FunctorWithIndex, FoldableWithIndex, TraversableWithIndex)
+#if !MIN_VERSION_lens(5,0,0)
 import qualified Control.Lens as L
+#endif
 import Data.IntMap.Strict (IntMap)
 import qualified Data.IntMap.Strict as IntMap
 import Data.Maybe

src/Data/Patch/Map.hs

@@ -19,7 +19,9 @@ module Data.Patch.Map where
 import Data.Patch.Class
 
 import Control.Lens hiding  (FunctorWithIndex, FoldableWithIndex, TraversableWithIndex)
+#if !MIN_VERSION_lens(5,0,0)
 import qualified Control.Lens as L
+#endif
 import Data.Map (Map)
 import qualified Data.Map as Map
 import Data.Maybe

src/Data/Patch/MapWithMove.hs

@@ -71,7 +71,9 @@ import Data.Patch.MapWithPatchingMove (PatchMapWithPatchingMove(..), To)
 import qualified Data.Patch.MapWithPatchingMove as PM -- already a transparent synonym
 
 import Control.Lens hiding  (FunctorWithIndex, FoldableWithIndex, TraversableWithIndex)
+#if !MIN_VERSION_lens(5,0,0)
 import qualified Control.Lens as L
+#endif
 import Data.List
 import Data.Map (Map)
 import qualified Data.Map as Map

src/Data/Patch/MapWithPatchingMove.hs

@@ -52,7 +52,7 @@ module Data.Patch.MapWithPatchingMove
 
 import Data.Patch.Class
 
-import Control.Lens hiding (from, to)
+import Control.Lens ((<&>))
 import Control.Lens.TH (makeWrapped)
 import Data.Align (align)
 import Data.Foldable (toList)