Clean up imports; Reduce dep footprint s/lens/microlens/

butcher.cabal

@@ -2,7 +2,7 @@
 --  documentation, see http://haskell.org/cabal/users-guide/
 
 name:                butcher
-version:             0.2.0.0
+version:             0.2.0.1
 -- synopsis:            
 -- description:         
 license:             BSD3
@@ -36,7 +36,8 @@ library
     { base >=4.8 && <4.10
     , free
     , unsafe
-    , lens
+    , microlens
+    , microlens-th
     , multistate
     , pretty
     , containers
@@ -90,7 +91,8 @@ test-suite tests
     , butcher
     , free
     , unsafe
-    , lens
+    , microlens
+    , microlens-th
     , multistate
     , pretty
     , containers

src/UI/Butcher/Monadic/Core.hs

@@ -39,12 +39,9 @@ where
 import           Control.Monad.Free
 import qualified Control.Monad.Trans.MultiRWS.Strict as MultiRWSS
 import qualified Control.Monad.Trans.MultiState.Strict as MultiStateS
-import           Data.Unique (Unique)
-import qualified System.Unsafe as Unsafe
 
-import qualified Control.Lens.TH as LensTH
+import qualified Lens.Micro as Lens
-import qualified Control.Lens as Lens
+import           Lens.Micro ( (%~), (.~) )
-import           Control.Lens ( (.=), (%=), (%~), (.~) )
 
 import qualified Text.PrettyPrint as PP
 import           Text.PrettyPrint ( (<+>), ($$), ($+$) )

src/UI/Butcher/Monadic/Flag.hs

@@ -21,19 +21,11 @@ where
 import           Control.Monad.Free
 import qualified Control.Monad.Trans.MultiRWS.Strict as MultiRWSS
 import qualified Control.Monad.Trans.MultiState.Strict as MultiStateS
-import           Data.Unique (Unique)
-import qualified System.Unsafe as Unsafe
-
-import qualified Control.Lens.TH as LensTH
-import qualified Control.Lens as Lens
-import           Control.Lens ( (.=), (%=), (%~), (.~) )
 
 import qualified Text.PrettyPrint as PP
 
 import           Data.HList.ContainsType
 
-import           Data.Dynamic
-
 import           UI.Butcher.Monadic.Types
 import           UI.Butcher.Monadic.Core
 

src/UI/Butcher/Monadic/IO.hs

@@ -11,19 +11,11 @@ where
 import           Control.Monad.Free
 import qualified Control.Monad.Trans.MultiRWS.Strict as MultiRWSS
 import qualified Control.Monad.Trans.MultiState.Strict as MultiStateS
-import           Data.Unique (Unique)
-import qualified System.Unsafe as Unsafe
-
-import qualified Control.Lens.TH as LensTH
-import qualified Control.Lens as Lens
-import           Control.Lens ( (.=), (%=), (%~), (.~) )
 
 import qualified Text.PrettyPrint as PP
 
 import           Data.HList.ContainsType
 
-import           Data.Dynamic
-
 import           UI.Butcher.Monadic.Types
 import           UI.Butcher.Monadic.Core
 import           UI.Butcher.Monadic.Pretty

src/UI/Butcher/Monadic/Param.hs

@@ -16,19 +16,11 @@ where
 import           Control.Monad.Free
 import qualified Control.Monad.Trans.MultiRWS.Strict as MultiRWSS
 import qualified Control.Monad.Trans.MultiState.Strict as MultiStateS
-import           Data.Unique (Unique)
-import qualified System.Unsafe as Unsafe
-
-import qualified Control.Lens.TH as LensTH
-import qualified Control.Lens as Lens
-import           Control.Lens ( (.=), (%=), (%~), (.~) )
 
 import qualified Text.PrettyPrint as PP
 
 import           Data.HList.ContainsType
 
-import           Data.Dynamic
-
 import           UI.Butcher.Monadic.Types
 import           UI.Butcher.Monadic.Core
 

src/UI/Butcher/Monadic/Pretty.hs

@@ -25,20 +25,12 @@ where
 import           Control.Monad.Free
 import qualified Control.Monad.Trans.MultiRWS.Strict as MultiRWSS
 import qualified Control.Monad.Trans.MultiState.Strict as MultiStateS
-import           Data.Unique (Unique)
-import qualified System.Unsafe as Unsafe
-
-import qualified Control.Lens.TH as LensTH
-import qualified Control.Lens as Lens
-import           Control.Lens ( (.=), (%=), (%~), (.~) )
 
 import qualified Text.PrettyPrint as PP
 import           Text.PrettyPrint ( (<+>), ($$), ($+$) )
 
 import           Data.HList.ContainsType
 
-import           Data.Dynamic
-
 import           UI.Butcher.Monadic.Types
 import           UI.Butcher.Monadic.Core
 

src/UI/Butcher/Monadic/Types.hs

@@ -30,16 +30,11 @@ where
 #include "prelude.inc"
 import           Control.Monad.Free
 import qualified Control.Monad.Trans.MultiState.Strict as MultiStateS
--- import           Data.Unique (Unique)
-import qualified System.Unsafe as Unsafe
 
-import qualified Control.Lens.TH as LensTH
+import qualified Lens.Micro.TH as LensTH
-import qualified Control.Lens as Lens
 
 import qualified Text.PrettyPrint as PP
 
-import           Data.Dynamic
-
 
 
 data Input = InputString String | InputArgs [String]
@@ -156,8 +151,8 @@ instance Show (CommandDesc out) where
 
 --
 
-Lens.makeLenses ''CommandDesc
+LensTH.makeLenses ''CommandDesc
-Lens.makeLenses ''PartDesc
+LensTH.makeLenses ''PartDesc
 
 --
 

srcinc/prelude.inc

@@ -26,7 +26,9 @@ import qualified System.Info.Extra
 import qualified System.Process.Extra
 import qualified System.Time.Extra
 
-import qualified Control.Lens
+import qualified Data.Either.Combinators
+
+-- import qualified Control.Lens
 
 -- import qualified Control.Monad.Error.Lens
 -- import qualified Control.Parallel.Strategies.Lens
@@ -248,12 +250,13 @@ import qualified Data.Char as Char
 -- import qualified Data.IORef as IORef
 -- import qualified Data.Int as Int
 -- import qualified Data.Ix as Ix
--- import qualified Data.Maybe as Maybe
+import qualified Data.Maybe as Maybe
 -- import qualified Data.Monoid as Monoid
 -- import qualified Data.Ord as Ord
 -- import qualified Data.Proxy as Proxy
 -- import qualified Data.Traversable as Traversable
 -- import qualified Data.Void as Void
+import qualified Control.Monad.Trans.Writer.Strict as WriterS
 
 #if MIN_VERSION_base(4,9,0)
 import qualified GHC.OldList as List
@@ -635,5 +638,5 @@ import Control.Monad.Trans.Class          ( lift
                                           )
 import Control.Monad.Trans.Maybe          ( MaybeT (..)
                                           )
-import Control.Lens.Operators             ( (<&>)
+import Lens.Micro                         ( (<&>)
                                           )