From 77c7ee3ee99808b88eb38087b869cf1962fe63e3 Mon Sep 17 00:00:00 2001
From: Victor Denisov <denisovenator@gmail.com>
Date: Thu, 11 May 2017 21:35:41 -0700
Subject: [PATCH] Drop MonadBaseControl from two more modules

---
 Database/MongoDB/Admin.hs  | 9 ++++-----
 Database/MongoDB/GridFS.hs | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Database/MongoDB/Admin.hs b/Database/MongoDB/Admin.hs
index ea5e721..1a07eab 100644
--- a/Database/MongoDB/Admin.hs
+++ b/Database/MongoDB/Admin.hs
@@ -42,7 +42,6 @@ import qualified Data.HashTable.IO as H
 import qualified Data.Set as Set
 
 import Control.Monad.Trans (MonadIO, liftIO)
-import Control.Monad.Trans.Control (MonadBaseControl)
 import Data.Bson (Document, Field(..), at, (=:), (=?), exclude, merge)
 import Data.Text (Text)
 
@@ -138,7 +137,7 @@ dropIndex coll idxName = do
     resetIndexCache
     runCommand ["deleteIndexes" =: coll, "index" =: idxName]
 
-getIndexes :: (MonadIO m, MonadBaseControl IO m, Functor m) => Collection -> Action m [Document]
+getIndexes :: MonadIO m => Collection -> Action m [Document]
 -- ^ Get all indexes on this collection
 getIndexes coll = do
     db <- thisDatabase
@@ -191,9 +190,9 @@ resetIndexCache = do
 
 -- ** User
 
-allUsers :: (MonadIO m, MonadBaseControl IO m, Functor m) => Action m [Document]
+allUsers :: MonadIO m => Action m [Document]
 -- ^ Fetch all users of this database
-allUsers = map (exclude ["_id"]) <$> (rest =<< find
+allUsers = map (exclude ["_id"]) `liftM` (rest =<< find
     (select [] "system.users") {sort = ["user" =: (1 :: Int)], project = ["user" =: (1 :: Int), "readOnly" =: (1 :: Int)]})
 
 addUser :: (MonadIO m)
@@ -260,7 +259,7 @@ storageSize c = at "storageSize" `liftM` collectionStats c
 totalIndexSize :: (MonadIO m) => Collection -> Action m Int
 totalIndexSize c = at "totalIndexSize" `liftM` collectionStats c
 
-totalSize :: (MonadIO m, MonadBaseControl IO m) => Collection -> Action m Int
+totalSize :: MonadIO m => Collection -> Action m Int
 totalSize coll = do
     x <- storageSize coll
     xs <- mapM isize =<< getIndexes coll
diff --git a/Database/MongoDB/GridFS.hs b/Database/MongoDB/GridFS.hs
index bc425e7..c1d03d0 100644
--- a/Database/MongoDB/GridFS.hs
+++ b/Database/MongoDB/GridFS.hs
@@ -28,7 +28,6 @@ import Control.Concurrent(forkIO)
 import Control.Monad(when)
 import Control.Monad.IO.Class
 import Control.Monad.Trans(MonadTrans, lift)
-import Control.Monad.Trans.Control(MonadBaseControl)
 import Control.Monad.Trans.Resource(MonadResource(..))
 import Data.Conduit
 import Data.Digest.Pure.MD5
@@ -76,7 +75,7 @@ getChunk (File bucket doc) i = do
     Just (Binary b) -> return (Just b)
     _ -> return Nothing
 
-findFile :: (MonadIO m, MonadBaseControl IO m) => Bucket -> Selector -> Action m [File]
+findFile :: MonadIO m => Bucket -> Selector -> Action m [File]
 -- ^ Find files in the bucket
 findFile bucket sel = do
   cursor <- find $ select sel $ files bucket