Skip to content

Commit 38d599f

Browse files
Merge pull request #375 from ambiata/topic/coding-standards
mismi-s3: Apply coding standards
2 parents f0d8803 + 461e8eb commit 38d599f

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

mismi-s3/src/Mismi/S3/Data.hs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,22 @@ module Mismi.S3.Data (
4141
, sse
4242
) where
4343

44-
import Control.Exception.Base
44+
import Control.Exception (Exception)
4545

4646
import qualified Data.Text as T
47-
import Data.Typeable
47+
import Data.Typeable (Typeable)
4848

4949
import P
5050

5151
import Mismi (Error, renderError)
5252
-- Just for compatibility, would be good to not do
5353
-- this at some point but for now we import everything
5454
-- and keep current export list.
55-
import Mismi.S3.Core.Data
55+
import Mismi.S3.Core.Data (Address (..), Bucket (..), Key (..), ReadGrant (..)
56+
, SyncMode (..), WriteMode (..), WriteResult (..), (//)
57+
, addressFromText, addressToText, basename, combineKey
58+
, dirname, foldSyncMode, foldWriteMode, removeCommonPrefix
59+
, s3Parser, withKey)
5660
import Network.AWS.S3 (ETag, ServerSideEncryption (..))
5761

5862
import System.FilePath (FilePath)

mismi-s3/src/Mismi/S3/Internal.hs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@ module Mismi.S3.Internal (
1313
, withFileSafe
1414
) where
1515

16-
import Control.Concurrent
16+
import Control.Concurrent (Chan, readChan, threadDelay, writeChan)
1717

18-
import Control.Monad.Catch
19-
import Control.Monad.IO.Class
18+
import Control.Monad.Catch (MonadCatch, onException)
19+
import Control.Monad.IO.Class (MonadIO, liftIO)
2020

21-
import Data.Conduit
21+
import Data.Conduit (Source, ($$))
2222
import qualified Data.Conduit.List as DC
2323

2424
import qualified Data.Text as T
25-
import Data.UUID
26-
import Data.UUID.V4
25+
import Data.UUID (toString)
26+
import Data.UUID.V4 (nextRandom)
2727

2828
import P
2929

3030
import Mismi (AWS, rawRunAWS)
3131
import Mismi.Amazonka (Env)
3232
import Mismi.S3.Data
33-
import Network.AWS.S3
33+
import Network.AWS.S3 (BucketName (..), ObjectKey (..))
3434

35-
import System.Directory
36-
import System.IO
37-
import System.FilePath
35+
import System.Directory (renameFile, removeFile)
36+
import System.IO (IO)
37+
import System.FilePath (FilePath, takeDirectory, takeFileName)
3838

39-
import Twine.Data
39+
import Twine.Data (Queue, writeQueue)
4040

4141

4242
f' :: (BucketName -> ObjectKey -> a) -> Address -> a

0 commit comments

Comments
 (0)