Align imports

src/Network/Minio.hs

@@ -1,30 +1,30 @@
 module Network.Minio
   (
 
-    D.ConnectInfo(..)
+    ConnectInfo(..)
-  , D.connect
+  , connect
 
-  , D.Minio
+  , Minio
-  , D.runMinio
+  , runMinio
 
   -- * Error handling
   -----------------------
   -- | Test
-  , D.MinioErr(..)
+  , MinioErr(..)
-  , D.MErrV(..)
+  , MErrV(..)
 
   -- * Data Types
   ----------------
   -- | Data types representing various object store concepts.
-  , D.Bucket
+  , Bucket
-  , D.Object
+  , Object
-  , D.BucketInfo(..)
+  , BucketInfo(..)
-  , D.UploadId
+  , UploadId
 
   -- * Bucket and Object Operations
   ---------------------------------
-  , S.getService
+  , getService
-  , S.getLocation
+  , getLocation
 
   , fGetObject
   , fPutObject
@@ -34,14 +34,10 @@ module Network.Minio
 This module exports the high-level Minio API for object storage.
 -}
 
-import qualified Network.Minio.S3API as S
-
-import qualified Network.Minio.Data as D
-
-import qualified System.IO as IO
-import qualified Data.Conduit as C
 import qualified Control.Monad.Trans.Resource as R
+import qualified Data.Conduit as C
 import qualified Data.Conduit.Binary as CB
+import qualified System.IO as IO
 
 import           Lib.Prelude
 

src/Network/Minio/API.hs

@@ -7,15 +7,14 @@ module Network.Minio.API
   , mkStreamRequest
   ) where
 
-import qualified Network.HTTP.Types as HT
-import           Network.HTTP.Conduit (Response)
-import qualified Network.HTTP.Conduit as NC
 import qualified Data.Conduit as C
 import           Data.Conduit.Binary (sourceHandleRange)
+import           Network.HTTP.Conduit (Response)
+import qualified Network.HTTP.Conduit as NC
+import qualified Network.HTTP.Types as HT
 
 import           Lib.Prelude
 
-
 import           Network.Minio.Data
 import           Network.Minio.Data.Crypto
 import           Network.Minio.Sign.V4

src/Network/Minio/Data.hs

@@ -1,17 +1,15 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving, TypeFamilies #-}
 module Network.Minio.Data where
 
-import qualified Data.ByteString as B
-import           Network.HTTP.Client (defaultManagerSettings, HttpException)
-import           Network.HTTP.Types (Method, Header, Query)
-import qualified Network.HTTP.Conduit as NC
-import Data.Default (Default(..))
-import qualified Network.HTTP.Types as HT
-
-import Control.Monad.Trans.Resource
-import Control.Monad.Trans.Control
 import           Control.Monad.Base
-
+import           Control.Monad.Trans.Control
+import           Control.Monad.Trans.Resource
+import qualified Data.ByteString as B
+import           Data.Default (Default(..))
+import           Network.HTTP.Client (defaultManagerSettings, HttpException)
+import qualified Network.HTTP.Conduit as NC
+import           Network.HTTP.Types (Method, Header, Query)
+import qualified Network.HTTP.Types as HT
 import           Text.XML
 
 import           Lib.Prelude

src/Network/Minio/Data/Crypto.hs

@@ -9,11 +9,11 @@ module Network.Minio.Data.Crypto
   ) where
 
 import           Crypto.Hash (SHA256(..), hashWith, Digest)
+import           Crypto.Hash.Conduit (sinkHash)
 import           Crypto.MAC.HMAC (hmac, HMAC)
 import           Data.ByteArray (ByteArrayAccess, convert)
 import           Data.ByteArray.Encoding (convertToBase, Base(Base16))
 import qualified Data.Conduit as C
-import Crypto.Hash.Conduit (sinkHash)
 
 import           Lib.Prelude
 

src/Network/Minio/S3API.hs

@@ -32,10 +32,10 @@ module Network.Minio.S3API
   , abortMultipartUpload
   ) where
 
-import qualified Network.HTTP.Types as HT
-import qualified Network.HTTP.Conduit as NC
 import qualified Data.Conduit as C
 import           Data.Default (def)
+import qualified Network.HTTP.Conduit as NC
+import qualified Network.HTTP.Types as HT
 
 import           Lib.Prelude
 

src/Network/Minio/Utils.hs

@@ -1,17 +1,15 @@
 module Network.Minio.Utils where
 
+import qualified Control.Exception.Lifted as ExL
 import qualified Control.Monad.Trans.Resource as R
-import qualified System.IO as IO
+import qualified Data.ByteString.Lazy as LBS
-import qualified Network.HTTP.Conduit as NC
+import qualified Data.Conduit as C
+import           Data.Text.Encoding.Error (lenientDecode)
 import qualified Network.HTTP.Client as NClient
 import           Network.HTTP.Conduit (Response)
-import qualified Data.Conduit as C
+import qualified Network.HTTP.Conduit as NC
-import qualified Data.ByteString.Lazy as LBS
-import Data.Text.Encoding.Error (lenientDecode)
--- import Data.Text.Encoding (decodeUtf8With)
 import qualified Network.HTTP.Types as HT
-import qualified Control.Exception.Lifted as ExL
+import qualified System.IO as IO
-
 
 import           Lib.Prelude
 

src/Network/Minio/XmlGenerator.hs

@@ -3,12 +3,13 @@ module Network.Minio.XmlGenerator
   , mkCompleteMultipartUploadRequest
   ) where
 
-import Lib.Prelude
 
-import qualified Data.Text as T
 import qualified Data.ByteString.Lazy as LBS
-import Text.XML
 import qualified Data.Map as M
+import qualified Data.Text as T
+import           Text.XML
+
+import           Lib.Prelude
 
 import           Network.Minio.Data
 

src/Network/Minio/XmlParser.hs

@@ -6,12 +6,12 @@ module Network.Minio.XmlParser
   , parseListObjectsResponse
   ) where
 
+import           Data.List (zip4)
+import qualified Data.Text as T
+import           Data.Text.Read (decimal)
+import           Data.Time
 import           Text.XML
 import           Text.XML.Cursor
-import qualified Data.Text as T
-import Data.Time
-import Data.Text.Read (decimal)
-import Data.List (zip4)
 
 import           Lib.Prelude
 

test/Network/Minio/XmlParser/Test.hs

@@ -3,9 +3,9 @@ module Network.Minio.XmlParser.Test
     xmlParserTests
   ) where
 
+import Data.Time (addGregorianYearsClip, fromGregorian, UTCTime(..))
 import Test.Tasty
 import Test.Tasty.HUnit
-import Data.Time (addGregorianYearsClip, fromGregorian, UTCTime(..))
 
 import Lib.Prelude
 

test/Spec.hs

@@ -8,8 +8,6 @@ import qualified System.IO as SIO
 import           Control.Monad.Trans.Resource (runResourceT)
 import qualified Data.Text as T
 import           Data.Default (Default(..))
--- import qualified Conduit as C
--- import Data.Conduit.Binary
 
 import           Network.Minio
 import           Network.Minio.Data