From d506011cd18850f2bd4dd1e3c6db7f696b63d1dd Mon Sep 17 00:00:00 2001 From: Tony Hannan Date: Thu, 10 Nov 2011 10:23:07 -0500 Subject: [PATCH] fix some warnings. bump version for previous 7.2.1 compatibility fix --- Database/MongoDB/Connection.hs | 2 +- Database/MongoDB/Internal/Protocol.hs | 2 +- Database/MongoDB/Query.hs | 4 ++-- mongoDB.cabal | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Database/MongoDB/Connection.hs b/Database/MongoDB/Connection.hs index 5e45264..7cde197 100644 --- a/Database/MongoDB/Connection.hs +++ b/Database/MongoDB/Connection.hs @@ -18,7 +18,7 @@ module Database.MongoDB.Connection ( import Prelude hiding (lookup) import Database.MongoDB.Internal.Protocol (Pipe, newPipe) import System.IO.Pipeline (IOE, close, isClosed) -import System.IO.Error as E (try) +import Control.Exception as E (try) import Network (HostName, PortID(..), connectTo) import Text.ParserCombinators.Parsec as T (parse, many1, letter, digit, char, eof, spaces, try, (<|>)) import Control.Monad.Identity (runIdentity) diff --git a/Database/MongoDB/Internal/Protocol.hs b/Database/MongoDB/Internal/Protocol.hs index 5ba670f..6872f81 100644 --- a/Database/MongoDB/Internal/Protocol.hs +++ b/Database/MongoDB/Internal/Protocol.hs @@ -35,7 +35,7 @@ import Data.IORef import System.IO.Unsafe (unsafePerformIO) import qualified Crypto.Hash.MD5 as MD5 (hash) import Data.UString as U (pack, append, toByteString) -import System.IO.Error as E (try) +import Control.Exception as E (try) import Control.Monad.Error import System.IO (hFlush) import Database.MongoDB.Internal.Util (whenJust, hGetN, bitOr, byteStringHex) diff --git a/Database/MongoDB/Query.hs b/Database/MongoDB/Query.hs index 631e25e..44bd39d 100644 --- a/Database/MongoDB/Query.hs +++ b/Database/MongoDB/Query.hs @@ -41,8 +41,8 @@ module Database.MongoDB.Query ( import Prelude as X hiding (lookup) import Data.UString as U (UString, dropWhile, any, tail) import Data.Bson (Document, at, valueAt, lookup, look, Field(..), (=:), (=?), Label, Value(String,Doc), Javascript, genObjectId) -import Database.MongoDB.Internal.Protocol (Pipe, Notice(..), Request(GetMore), Reply(..), QueryOption(..), ResponseFlag(..), InsertOption(..), UpdateOption(..), DeleteOption(..), CursorId, FullCollection, Username, Password, pwKey) -import qualified Database.MongoDB.Internal.Protocol as P (send, call, Request(Query, qOptions, qFullCollection, qSkip, qBatchSize, qSelector, qProjector)) +import Database.MongoDB.Internal.Protocol (Pipe, Notice(..), Request(GetMore, qOptions, qFullCollection, qSkip, qBatchSize, qSelector, qProjector), Reply(..), QueryOption(..), ResponseFlag(..), InsertOption(..), UpdateOption(..), DeleteOption(..), CursorId, FullCollection, Username, Password, pwKey) +import qualified Database.MongoDB.Internal.Protocol as P (send, call, Request(Query)) import Database.MongoDB.Internal.Util (MonadIO', loop, liftIOE, true1, (<.>)) import Control.Monad.MVar import Control.Monad.Error diff --git a/mongoDB.cabal b/mongoDB.cabal index 7fe2fc3..71c7158 100644 --- a/mongoDB.cabal +++ b/mongoDB.cabal @@ -1,5 +1,5 @@ name: mongoDB -version: 1.1.0 +version: 1.1.1 build-type: Simple license: OtherLicense license-file: LICENSE