re conduit deprecations: use ConduitT directly

Fixes some compile errors e.g.:
```
gitlib-libgit2>       Expected: Maybe (Git.CommitOid LgRepo)
gitlib-libgit2>                 -> Git.CommitOid LgRepo
gitlib-libgit2>                 -> Bool
gitlib-libgit2>                 -> ConduitT i (Git.ObjectOid LgRepo) m ()
gitlib-libgit2>         Actual: Maybe CommitOid
gitlib-libgit2>                 -> CommitOid -> Bool -> Producer m0 ObjectOid
gitlib-libgit2>     • In the expression: lgSourceObjects
gitlib-libgit2>       In an equation for ‘Git.sourceObjects’:
gitlib-libgit2>           Git.sourceObjects = lgSourceObjects
gitlib-libgit2>       In the instance declaration for ‘Git.MonadGit LgRepo m’
gitlib-libgit2>     • Relevant bindings include
gitlib-libgit2>         sourceObjects :: Maybe (Git.CommitOid LgRepo)
gitlib-libgit2>                          -> Git.CommitOid LgRepo
gitlib-libgit2>                          -> Bool
gitlib-libgit2>                          -> ConduitT i (Git.ObjectOid LgRepo) m ()
gitlib-libgit2>           (bound at Git/Libgit2.hs:214:5)
gitlib-libgit2>     |
gitlib-libgit2> 214 |     sourceObjects     = lgSourceObjects
```

Author: m-col

gitlib-cmdline/Git/CmdLine.hs

@@ -372,7 +372,7 @@ cliExistsObject (shaToText -> sha) = do
 
 cliSourceObjects :: MonadCli m
                  => Maybe (CommitOid CliRepo) -> CommitOid CliRepo -> Bool
-                 -> Producer (ReaderT CliRepo m) (ObjectOid CliRepo)
+                 -> ConduitT i (ObjectOid CliRepo) (ReaderT CliRepo m ())
 cliSourceObjects mhave need alsoTrees = do
     shas <- lift $ doRunGit run
             ([ "--no-pager", "log", "--format=%H %T" ]
@@ -496,7 +496,7 @@ cliTreeEntry tree fp = do
 
 cliSourceTreeEntries :: MonadCli m
                      => Tree CliRepo
-                     -> Producer (ReaderT CliRepo m) (TreeFilePath, TreeEntry CliRepo)
+                     -> ConduitT i (TreeFilePath, TreeEntry CliRepo) (ReaderT CliRepo m ())
 cliSourceTreeEntries tree = do
     contents <- lift $ do
         toid <- treeOid tree
@@ -633,7 +633,7 @@ cliUpdateRef refName (RefSymbolic targetName) =
 cliDeleteRef :: MonadCli m => Text -> ReaderT CliRepo m ()
 cliDeleteRef refName = runGit_ ["update-ref", "-d", fromStrict refName]
 
-cliSourceRefs :: MonadCli m => Producer (ReaderT CliRepo m) Text
+cliSourceRefs :: MonadCli m => ConduitT i Text (ReaderT CliRepo m ())
 cliSourceRefs = do
     mxs <- lift $ cliShowRef Nothing
     yieldMany $ case mxs of

gitlib-hit/Git/Hit.hs

@@ -380,7 +380,7 @@ hitWriteTree entMap = do
     fmap Tagged $ liftIO $ DGS.setObject g $ DGO.ObjTree $ DGT.Tree ents
 
 
-hitSourceRefs :: MonadHit m => Producer (ReaderT HitRepo m) Text
+hitSourceRefs :: MonadHit m => ConduitT i Text (ReaderT HitRepo m ())
 hitSourceRefs = do
     g <- lift $ hitGit <$> getRepository
     -- TODO: this produces branches & tags, but not remotes
@@ -394,7 +394,7 @@ hitSourceRefs = do
 
 hitSourceTreeEntries :: MonadHit m
                      => Tree HitRepo
-                     -> Producer (ReaderT HitRepo m) TreePathEntry
+                     -> ConduitT i TreePathEntry (ReaderT HitRepo m ())
 hitSourceTreeEntries (HitTree oid) = do
     g <- lift $ hitGit <$> getRepository
     ents <- liftIO $ readTreeRecurse "" (untag oid) g

gitlib-libgit2/Git/Libgit2.hs

@@ -67,7 +67,6 @@ import           Control.Monad.Catch
 import           Control.Monad.Loops
 import           Control.Monad.Trans.Reader (ReaderT, runReaderT, ask)
 import           Control.Monad.Trans.Resource
-import           Control.Monad.IO.Unlift
 import           Data.Bits ((.|.), (.&.))
 import           Data.Bool (bool)
 import           Data.ByteString (ByteString)
@@ -103,9 +102,8 @@ import           Foreign.Storable
 import qualified Git
 import           Git.Libgit2.Internal
 import           Git.Libgit2.Types
-import           Language.Haskell.TH.Syntax (Loc(..))
 
-import           Prelude hiding (mapM, mapM_, sequence, catch)
+import           Prelude hiding (mapM, mapM_, sequence)
 import           System.Directory
 import           System.FilePath.Posix
 import           System.IO (openBinaryTempFile, hClose)
@@ -351,7 +349,7 @@ lgTreeOid (LgTree (Just tree)) = liftIO $ do
 gatherFrom' :: (MonadExcept m, MonadUnliftIO m)
            => Int                -- ^ Size of the queue to create
            -> (TBQueue o -> m ()) -- ^ Action that generates output values
-           -> Producer m o
+           -> ConduitT i o m ()
 gatherFrom' size scatter = do
     chan   <- liftIO $ newTBQueueIO (fromIntegral size)
     worker <- lift $ async (scatter chan)
@@ -371,7 +369,7 @@ gatherFrom' size scatter = do
 lgSourceTreeEntries
     :: (MonadLg m, HasLgRepo m)
     => Tree
-    -> Producer m (Git.TreeFilePath, TreeEntry)
+    -> ConduitT i (Git.TreeFilePath, TreeEntry) m ()
 lgSourceTreeEntries (LgTree Nothing) = return ()
 lgSourceTreeEntries (LgTree (Just tree)) = gatherFrom' 16 $ \queue -> do
     liftIO $ withForeignPtr tree $ \tr -> do
@@ -708,7 +706,7 @@ lgForEachObject odbPtr f payload =
 
 lgSourceObjects :: (MonadLg m, HasLgRepo m)
                 => Maybe CommitOid -> CommitOid -> Bool
-                -> Producer m ObjectOid
+                -> ConduitT i ObjectOid m ()
 lgSourceObjects mhave need alsoTrees = do
     repo   <- lift getRepository
     walker <- liftIO $ alloca $ \pptr -> do
@@ -940,7 +938,7 @@ flagsToInt flags = (if listFlagOid flags      then 1 else 0)
                  + (if listFlagHasPeel flags  then 8 else 0)
 
 
-lgSourceRefs :: (MonadLg m, HasLgRepo m) => Producer m Git.RefName
+lgSourceRefs :: (MonadLg m, HasLgRepo m) => ConduitT i Git.RefName m ()
 lgSourceRefs =
     gatherFrom' 16 $ \queue -> do
         repo <- getRepository
@@ -1033,10 +1031,11 @@ lgThrow f = do
 
 lgDiffContentsWithTree
     :: MonadLg m
-    => Source (ReaderT LgRepo m)
+    => ConduitM ()
         (Either Git.TreeFilePath (Either Git.SHA ByteString))
+        (ReaderT LgRepo m) ()
     -> Tree
-    -> Producer (ReaderT LgRepo m) ByteString
+    -> ConduitT i ByteString (ReaderT LgRepo m) ()
 lgDiffContentsWithTree _contents (LgTree Nothing) =
     liftIO $ throwM $
         Git.DiffTreeToIndexFailed "Cannot diff against an empty tree"