Skip to content

Commit f9bcc15

Browse files
phadejphadej
committed
Apply stylish-haskell on all modules
1 parent e3c91ec commit f9bcc15

File tree

42 files changed

+573
-437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+573
-437
lines changed

‎servant-client/src/Servant/Client.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ module Servant.Client
1313
, module Servant.Client.Core.Reexport
1414
) where
1515

16-
import Servant.Client.Core.Reexport
17-
import Servant.Client.Internal.HttpClient
16+
import Servant.Client.Core.Reexport
17+
import Servant.Client.Internal.HttpClient

‎servant-client/src/Servant/Client/Internal/HttpClient.hs

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,49 @@
1111
{-# LANGUAGE TypeFamilies #-}
1212
module Servant.Client.Internal.HttpClient where
1313

14-
import Prelude ()
14+
import Prelude ()
1515
import Prelude.Compat
1616

1717
import Control.Concurrent.STM.TVar
1818
import Control.Exception
1919
import Control.Monad
20-
import Control.Monad.Base (MonadBase (..))
21-
import Control.Monad.Catch (MonadCatch, MonadThrow)
22-
import Control.Monad.Error.Class (MonadError (..))
20+
import Control.Monad.Base
21+
(MonadBase (..))
22+
import Control.Monad.Catch
23+
(MonadCatch, MonadThrow)
24+
import Control.Monad.Error.Class
25+
(MonadError (..))
2326
import Control.Monad.Reader
24-
import Control.Monad.STM (atomically)
25-
import Control.Monad.Trans.Control (MonadBaseControl (..))
27+
import Control.Monad.STM
28+
(atomically)
29+
import Control.Monad.Trans.Control
30+
(MonadBaseControl (..))
2631
import Control.Monad.Trans.Except
27-
import Data.ByteString.Builder (toLazyByteString)
32+
import Data.ByteString.Builder
33+
(toLazyByteString)
2834
import qualified Data.ByteString.Lazy as BSL
29-
import Data.Foldable (toList, for_)
30-
import Data.Functor.Alt (Alt (..))
31-
import Data.Maybe (maybeToList)
32-
import Data.Semigroup ((<>))
33-
import Data.Proxy (Proxy (..))
34-
import Data.Sequence (fromList)
35-
import Data.String (fromString)
35+
import Data.Foldable
36+
(for_, toList)
37+
import Data.Functor.Alt
38+
(Alt (..))
39+
import Data.Maybe
40+
(maybeToList)
41+
import Data.Proxy
42+
(Proxy (..))
43+
import Data.Semigroup
44+
((<>))
45+
import Data.Sequence
46+
(fromList)
47+
import Data.String
48+
(fromString)
3649
import qualified Data.Text as T
37-
import Data.Time.Clock (getCurrentTime)
50+
import Data.Time.Clock
51+
(getCurrentTime)
3852
import GHC.Generics
39-
import Network.HTTP.Media (renderHeader)
40-
import Network.HTTP.Types (hContentType, renderQuery,
41-
statusCode)
53+
import Network.HTTP.Media
54+
(renderHeader)
55+
import Network.HTTP.Types
56+
(hContentType, renderQuery, statusCode)
4257
import Servant.Client.Core
4358

4459
import qualified Network.HTTP.Client as Client

‎servant-client/test/Servant/ClientSpec.hs

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -26,56 +26,53 @@
2626
#include "overlapping-compat.h"
2727
module Servant.ClientSpec (spec, Person(..), startWaiApp, endWaiApp) where
2828

29-
import Prelude ()
29+
import Prelude ()
3030
import Prelude.Compat
3131

32-
import Control.Arrow (left)
33-
import Control.Concurrent (ThreadId, forkIO,
34-
killThread)
35-
import Control.Exception (bracket)
36-
import Control.Monad.Error.Class (throwError)
32+
import Control.Arrow
33+
(left)
34+
import Control.Concurrent
35+
(ThreadId, forkIO, killThread)
36+
import Control.Exception
37+
(bracket)
38+
import Control.Monad.Error.Class
39+
(throwError)
3740
import Data.Aeson
38-
import Data.Char (chr, isPrint)
39-
import Data.Foldable (forM_)
40-
import Data.Semigroup ((<>))
41-
import Data.Monoid ()
41+
import Data.Char
42+
(chr, isPrint)
43+
import Data.Foldable
44+
(forM_)
45+
import Data.Monoid ()
4246
import Data.Proxy
47+
import Data.Semigroup
48+
((<>))
4349
import qualified Generics.SOP as SOP
44-
import GHC.Generics (Generic)
50+
import GHC.Generics
51+
(Generic)
4552
import qualified Network.HTTP.Client as C
4653
import qualified Network.HTTP.Types as HTTP
4754
import Network.Socket
4855
import qualified Network.Wai as Wai
4956
import Network.Wai.Handler.Warp
50-
import System.IO.Unsafe (unsafePerformIO)
57+
import System.IO.Unsafe
58+
(unsafePerformIO)
5159
import Test.Hspec
5260
import Test.Hspec.QuickCheck
5361
import Test.HUnit
5462
import Test.QuickCheck
55-
import Web.FormUrlEncoded (FromForm, ToForm)
56-
57-
import Servant.API ((:<|>) ((:<|>)),
58-
(:>), AuthProtect,
59-
BasicAuth,
60-
BasicAuthData (..),
61-
Capture,
62-
CaptureAll, Delete,
63-
DeleteNoContent,
64-
EmptyAPI, addHeader,
65-
FormUrlEncoded,
66-
Get, Header,
67-
Headers, JSON,
68-
NoContent (NoContent),
69-
Post, Put, Raw,
70-
QueryFlag,
71-
QueryParam,
72-
QueryParams,
73-
ReqBody,
74-
getHeaders)
63+
import Web.FormUrlEncoded
64+
(FromForm, ToForm)
65+
66+
import Servant.API
67+
((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth,
68+
BasicAuthData (..), Capture, CaptureAll, Delete,
69+
DeleteNoContent, EmptyAPI, FormUrlEncoded, Get, Header,
70+
Headers, JSON, NoContent (NoContent), Post, Put, QueryFlag,
71+
QueryParam, QueryParams, Raw, ReqBody, addHeader, getHeaders)
7572
import Servant.API.Internal.Test.ComprehensiveAPI
7673
import Servant.Client
77-
import qualified Servant.Client.Core.Internal.Request as Req
78-
import qualified Servant.Client.Core.Internal.Auth as Auth
74+
import qualified Servant.Client.Core.Internal.Auth as Auth
75+
import qualified Servant.Client.Core.Internal.Request as Req
7976
import Servant.Server
8077
import Servant.Server.Experimental.Auth
8178

‎servant-client/test/Servant/StreamSpec.hs

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,36 @@
2626
#include "overlapping-compat.h"
2727
module Servant.StreamSpec (spec) where
2828

29-
import Control.Monad (replicateM_, void)
29+
import Control.Monad
30+
(replicateM_, void)
3031
import qualified Data.ByteString as BS
3132
import Data.Proxy
3233
import qualified Network.HTTP.Client as C
33-
import Prelude ()
34+
import Prelude ()
3435
import Prelude.Compat
35-
import System.IO (IOMode (ReadMode), withFile)
36-
import System.IO.Unsafe (unsafePerformIO)
36+
import System.IO
37+
(IOMode (ReadMode), withFile)
38+
import System.IO.Unsafe
39+
(unsafePerformIO)
3740
import Test.Hspec
3841
import Test.QuickCheck
3942

40-
import Servant.API ((:<|>) ((:<|>)), (:>), JSON,
41-
NetstringFraming, NewlineFraming,
42-
OctetStream, ResultStream (..),
43-
StreamGenerator (..), StreamGet,
44-
NoFraming)
43+
import Servant.API
44+
((:<|>) ((:<|>)), (:>), JSON, NetstringFraming,
45+
NewlineFraming, NoFraming, OctetStream, ResultStream (..),
46+
StreamGenerator (..), StreamGet)
4547
import Servant.Client
46-
import Servant.ClientSpec (Person (..))
48+
import Servant.ClientSpec
49+
(Person (..))
4750
import qualified Servant.ClientSpec as CS
4851
import Servant.Server
4952

5053
#if MIN_VERSION_base(4,10,0)
51-
import GHC.Stats (gcdetails_mem_in_use_bytes, gc, getRTSStats)
54+
import GHC.Stats
55+
(gc, gcdetails_mem_in_use_bytes, getRTSStats)
5256
#else
53-
import GHC.Stats (currentBytesUsed, getGCStats)
57+
import GHC.Stats
58+
(currentBytesUsed, getGCStats)
5459
#endif
5560

5661
spec :: Spec

‎servant-docs/example/greet.hs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
{-# LANGUAGE OverloadedStrings #-}
66
{-# LANGUAGE TypeOperators #-}
77
{-# OPTIONS_GHC -fno-warn-orphans #-}
8-
import Control.Lens
9-
import Data.Aeson
10-
import Data.Proxy
11-
import Data.String.Conversions
12-
import Data.Text (Text)
13-
import GHC.Generics
14-
import Servant.API
15-
import Servant.Docs
8+
import Control.Lens
9+
import Data.Aeson
10+
import Data.Proxy
11+
import Data.String.Conversions
12+
import Data.Text
13+
(Text)
14+
import GHC.Generics
15+
import Servant.API
16+
import Servant.Docs
1617

1718
-- * Example
1819

‎servant-docs/src/Servant/Docs.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ module Servant.Docs
5656
, single
5757
) where
5858

59-
import Servant.Docs.Internal
60-
import Servant.Docs.Internal.Pretty
59+
import Servant.Docs.Internal
60+
import Servant.Docs.Internal.Pretty

‎servant-docs/src/Servant/Docs/Internal.hs

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,45 @@
2020
#include "overlapping-compat.h"
2121
module Servant.Docs.Internal where
2222

23-
import Prelude ()
23+
import Prelude ()
2424
import Prelude.Compat
2525

2626
import Control.Applicative
27-
import Control.Arrow (second)
28-
import Control.Lens (makeLenses, mapped, over,
29-
traversed, view, (%~), (&), (.~),
30-
(<>~), (^.), (|>))
27+
import Control.Arrow
28+
(second)
29+
import Control.Lens
30+
(makeLenses, mapped, over, traversed, view, (%~), (&), (.~),
31+
(<>~), (^.), (|>))
3132
import qualified Control.Monad.Omega as Omega
3233
import qualified Data.ByteString.Char8 as BSC
33-
import Data.ByteString.Lazy.Char8 (ByteString)
34+
import Data.ByteString.Lazy.Char8
35+
(ByteString)
3436
import qualified Data.CaseInsensitive as CI
35-
import Data.Foldable (fold)
36-
import Data.Hashable (Hashable)
37-
import Data.HashMap.Strict (HashMap)
38-
import Data.List.Compat (intercalate, intersperse, sort)
39-
import Data.List.NonEmpty (NonEmpty ((:|)), groupWith)
37+
import Data.Foldable
38+
(fold)
39+
import Data.Hashable
40+
(Hashable)
41+
import Data.HashMap.Strict
42+
(HashMap)
43+
import Data.List.Compat
44+
(intercalate, intersperse, sort)
45+
import Data.List.NonEmpty
46+
(NonEmpty ((:|)), groupWith)
4047
import qualified Data.List.NonEmpty as NE
4148
import Data.Maybe
42-
import Data.Monoid (All (..), Any (..), Dual (..),
43-
First (..), Last (..),
44-
Product (..), Sum (..))
45-
import Data.Ord (comparing)
46-
import Data.Proxy (Proxy (Proxy))
47-
import Data.Semigroup (Semigroup (..))
48-
import Data.String.Conversions (cs)
49-
import Data.Text (Text, unpack)
49+
import Data.Monoid
50+
(All (..), Any (..), Dual (..), First (..), Last (..),
51+
Product (..), Sum (..))
52+
import Data.Ord
53+
(comparing)
54+
import Data.Proxy
55+
(Proxy (Proxy))
56+
import Data.Semigroup
57+
(Semigroup (..))
58+
import Data.String.Conversions
59+
(cs)
60+
import Data.Text
61+
(Text, unpack)
5062
import GHC.Generics
5163
import GHC.TypeLits
5264
import Servant.API

‎servant-docs/src/Servant/Docs/Internal/Pretty.hs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@
44
{-# LANGUAGE MultiParamTypeClasses #-}
55
{-# LANGUAGE OverloadedStrings #-}
66
{-# LANGUAGE PolyKinds #-}
7-
{-# LANGUAGE TypeOperators #-}
87
{-# LANGUAGE TypeFamilies #-}
8+
{-# LANGUAGE TypeOperators #-}
99

1010
module Servant.Docs.Internal.Pretty where
1111

12-
import Data.Aeson (ToJSON(..))
13-
import Data.Aeson.Encode.Pretty (encodePretty)
14-
import Data.Proxy (Proxy(Proxy))
15-
import Network.HTTP.Media ((//))
16-
import Servant.API
12+
import Data.Aeson
13+
(ToJSON (..))
14+
import Data.Aeson.Encode.Pretty
15+
(encodePretty)
16+
import Data.Proxy
17+
(Proxy (Proxy))
18+
import Network.HTTP.Media
19+
((//))
20+
import Servant.API
1721

1822
-- | PrettyJSON content type.
1923
data PrettyJSON

‎servant-docs/test/Servant/DocsSpec.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import Control.Lens
2020
import Data.Aeson
2121
import Data.Monoid
2222
import Data.Proxy
23-
import Data.String.Conversions (cs)
23+
import Data.String.Conversions
24+
(cs)
2425
import GHC.Generics
2526
import Test.Hspec
2627

‎servant-foreign/Setup.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
import Distribution.Simple
1+
import Distribution.Simple
22
main = defaultMain

0 commit comments

Comments
 (0)