stylish haskell changes

And import fix.

servant-client/src/Servant/Common/BaseUrl.hs

@@ -11,7 +11,7 @@ module Servant.Common.BaseUrl (
   , showBaseUrl
 ) where
 
-import Control.Monad.Catch (MonadThrow, throwM, Exception)
+import           Control.Monad.Catch (Exception, MonadThrow, throwM)
 import           Data.List
 import           Data.Typeable
 import           GHC.Generics

servant-client/test/Spec.hs

@@ -1,4 +1,4 @@
-import Servant.ClientSpec (spec, failSpec)
+import           Servant.ClientSpec (failSpec, spec)
 
 main :: IO ()
 main = do

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

@@ -1,5 +1,5 @@
-{-# LANGUAGE ConstraintKinds        #-}
 {-# LANGUAGE CPP                    #-}
+{-# LANGUAGE ConstraintKinds        #-}
 {-# LANGUAGE DataKinds              #-}
 {-# LANGUAGE DeriveGeneric          #-}
 {-# LANGUAGE FlexibleContexts       #-}
@@ -23,6 +23,7 @@ module Servant.Docs.Internal where
 import           Control.Applicative
 #endif
 import           Control.Lens
+import           Data.ByteString.Conversion (ToByteString, toByteString)
 import           Data.ByteString.Lazy.Char8 (ByteString)
 import qualified Data.CaseInsensitive       as CI
 import           Data.Hashable
@@ -32,7 +33,6 @@ import           Data.Maybe
 import           Data.Monoid
 import           Data.Ord                   (comparing)
 import           Data.Proxy
-import           Data.ByteString.Conversion (ToByteString, toByteString)
 import           Data.String.Conversions
 import           Data.Text                  (Text, pack, unpack)
 import           GHC.Exts                   (Constraint)

servant-examples/auth-combinator/auth-combinator.hs

@@ -1,10 +1,10 @@
 {-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE DeriveGeneric       #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE FlexibleInstances   #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeFamilies        #-}
+{-# LANGUAGE TypeOperators       #-}
 import           Data.Aeson
 import           Data.ByteString          (ByteString)
 import           Data.Text                (Text)

servant-examples/hackage/hackage.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeOperators     #-}
 import           Control.Applicative
 import           Control.Monad
 import           Control.Monad.IO.Class

servant-examples/socket-io-chat/socket-io-chat.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP               #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeOperators     #-}
 
 
@@ -8,17 +8,17 @@ import Data.Monoid ((<>))
 #if !MIN_VERSION_base(4,8,0)
 import           Control.Applicative      ((<$>))
 #endif
-import Network.Wai
-import Servant
 import           Network.EngineIO.Wai
+import           Network.Wai
 import           Network.Wai.Handler.Warp (run)
+import           Servant
 
 
 import qualified Control.Concurrent.STM   as STM
 import qualified Network.SocketIO         as SocketIO
 
 
-import Chat (eioServer, ServerState (..))
+import           Chat                     (ServerState (..), eioServer)
 
 
 type API = "socket.io" :> Raw

servant-examples/tutorial/T1.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE DataKinds     #-}
-{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeFamilies  #-}
 {-# LANGUAGE TypeOperators #-}
 module T1 where
 

servant-examples/tutorial/T10.hs

@@ -1,9 +1,9 @@
 {-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE TypeFamilies          #-}
 {-# LANGUAGE TypeOperators         #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
 module T10 where
 
 import           Data.ByteString.Lazy    (ByteString)

servant-examples/tutorial/T2.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE DataKinds     #-}
-{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeFamilies  #-}
 {-# LANGUAGE TypeOperators #-}
 module T2 where
 

servant-examples/tutorial/T3.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE DataKinds     #-}
-{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeFamilies  #-}
 {-# LANGUAGE TypeOperators #-}
 module T3 where
 

servant-examples/tutorial/T4.hs

@@ -1,9 +1,9 @@
 {-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeFamilies      #-}
+{-# LANGUAGE TypeOperators     #-}
 module T4 where
 
 import           Data.Aeson

servant-examples/tutorial/T5.hs

@@ -1,8 +1,8 @@
 {-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeFamilies      #-}
+{-# LANGUAGE TypeOperators     #-}
 module T5 where
 
 import           Control.Monad.IO.Class

servant-examples/tutorial/T9.hs

@@ -1,8 +1,8 @@
 {-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeFamilies      #-}
+{-# LANGUAGE TypeOperators     #-}
 module T9 where
 
 import           Control.Applicative

servant-examples/tutorial/tutorial.hs

@@ -3,6 +3,7 @@ import Network.Wai.Handler.Warp
 import           System.Environment
 
 import qualified T1
+import qualified T10
 import qualified T2
 import qualified T3
 import qualified T4
@@ -10,7 +11,6 @@ import qualified T5
 import qualified T6
 import qualified T7
 import qualified T9
-import qualified T10
 
 app :: String -> (Application -> IO ()) -> IO ()
 app n f = case n of

servant-js/examples/counter.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DataKinds                  #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE DeriveGeneric              #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators              #-}
 
 import           Control.Concurrent.STM
 import           Control.Monad.IO.Class

servant-js/src/Servant/JS.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE TypeOperators     #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Servant.JS

servant-js/src/Servant/JS/Angular.hs

@@ -1,9 +1,9 @@
 module Servant.JS.Angular where
 
-import Servant.JS.Internal
 import           Control.Lens
 import           Data.List
 import           Data.Monoid
+import           Servant.JS.Internal
 
 -- | Options specific to the angular code generator
 data AngularOptions = AngularOptions

servant-js/src/Servant/JS/Axios.hs

@@ -1,10 +1,10 @@
 module Servant.JS.Axios where
 
-import Servant.JS.Internal
 import           Control.Lens
 import           Data.Char           (toLower)
 import           Data.List
 import           Data.Monoid
+import           Servant.JS.Internal
 
 -- | Axios 'configuration' type
 -- Let you customize the generation using Axios capabilities

servant-js/src/Servant/JS/JQuery.hs

@@ -1,9 +1,9 @@
 module Servant.JS.JQuery where
 
-import Servant.JS.Internal
 import           Control.Lens
 import           Data.List
 import           Data.Monoid
+import           Servant.JS.Internal
 
 -- | Generate javascript functions that use the /jQuery/ library
 --   to make the AJAX calls. Uses 'defCommonGeneratorOptions'

servant-js/src/Servant/JS/Vanilla.hs

@@ -1,9 +1,9 @@
 module Servant.JS.Vanilla where
 
-import Servant.JS.Internal
 import           Control.Lens
 import           Data.List
 import           Data.Monoid
+import           Servant.JS.Internal
 
 -- | Generate vanilla javascript functions to make AJAX requests
 --   to your API, using /XMLHttpRequest/. Uses 'defCommonGeneratorOptions'

servant-js/test/Servant/JSSpec.hs

@@ -14,10 +14,10 @@ import Test.Hspec
 
 import           Servant.API
 import           Servant.JS
-import qualified Servant.JS.Vanilla as JS
-import qualified Servant.JS.JQuery as JQ
 import qualified Servant.JS.Angular           as NG
 import qualified Servant.JS.Axios             as AX
+import qualified Servant.JS.JQuery            as JQ
+import qualified Servant.JS.Vanilla           as JS
 import           Servant.JSSpec.CustomHeaders
 
 type TestAPI = "simple" :> ReqBody '[JSON,FormUrlEncoded] String :> Post '[JSON] Bool

servant-mock/example/main.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DataKinds                  #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE DeriveGeneric              #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators              #-}
 import           Data.Aeson
 import           GHC.Generics
 import           Network.Wai.Handler.Warp

servant-server/example/greet.hs

@@ -1,9 +1,9 @@
 {-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE DeriveGeneric     #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PolyKinds         #-}
 {-# LANGUAGE TypeFamilies      #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TypeOperators     #-}
-{-# LANGUAGE OverloadedStrings #-}
 
 import           Data.Aeson
 import           Data.Monoid

servant-server/src/Servant/Server/Internal.hs

@@ -27,7 +27,7 @@ import           Control.Monad.Trans.Either  (EitherT)
 import qualified Data.ByteString             as B
 import qualified Data.ByteString.Lazy        as BL
 import qualified Data.Map                    as M
-import           Data.Maybe                  (catMaybes, fromMaybe)
+import           Data.Maybe                  (mapMaybe, fromMaybe)
 import           Data.String                 (fromString)
 import           Data.String.Conversions     (cs, (<>), ConvertibleStrings)
 import           Data.Text                   (Text)

servant-server/src/Servant/Server/Internal/RoutingApplication.hs

@@ -11,15 +11,16 @@ import           Data.Monoid                 (Monoid, mappend, mempty)
 import           Control.Monad.Trans.Either         (EitherT, runEitherT)
 import qualified Data.ByteString                    as B
 import qualified Data.ByteString.Lazy               as BL
-import           Data.IORef                  (newIORef, readIORef, writeIORef)
+import           Data.IORef                         (newIORef, readIORef,
+                                                     writeIORef)
 import           Data.Maybe                         (fromMaybe)
 import           Data.Monoid                        ((<>))
 import           Data.String                        (fromString)
-import           Network.HTTP.Types          hiding (Header, ResponseHeaders)
+import           Network.HTTP.Types                 hiding (Header,
-import           Network.Wai                 (Application, Request, Response,
+                                                     ResponseHeaders)
-                                              ResponseReceived,
+import           Network.Wai                        (Application, Request,
-                                              requestBody,
+                                                     Response, ResponseReceived,
-                                              responseLBS,
+                                                     requestBody, responseLBS,
                                                      strictRequestBody)
 import           Servant.API                        ((:<|>) (..))
 import           Servant.Server.Internal.ServantErr

servant-server/src/Servant/Server/Internal/ServantErr.hs

@@ -5,7 +5,7 @@ module Servant.Server.Internal.ServantErr where
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Lazy  as LBS
 import qualified Network.HTTP.Types    as HTTP
-import           Network.Wai               (responseLBS, Response)
+import           Network.Wai           (Response, responseLBS)
 
 data ServantErr = ServantErr { errHTTPCode     :: Int
                              , errReasonPhrase :: String

servant-server/src/Servant/Utils/StaticFiles.hs

@@ -7,10 +7,11 @@ module Servant.Utils.StaticFiles (
   serveDirectory,
  ) where
 
-import System.FilePath (addTrailingPathSeparator)
+import           Network.Wai.Application.Static (defaultFileServerSettings,
-import Network.Wai.Application.Static (staticApp, defaultFileServerSettings)
+                                                 staticApp)
 import           Servant.API.Raw                (Raw)
 import           Servant.Server                 (Server)
+import           System.FilePath                (addTrailingPathSeparator)
 #if !MIN_VERSION_wai_app_static(3,1,0)
 import           Filesystem.Path.CurrentOS      (decodeString)
 #endif

servant-server/test/Servant/Utils/StaticFilesSpec.hs

@@ -8,10 +8,12 @@ module Servant.Utils.StaticFilesSpec where
 import           Control.Exception         (bracket)
 import           Data.Proxy                (Proxy (Proxy))
 import           Network.Wai               (Application)
-import System.Directory (getCurrentDirectory, setCurrentDirectory, createDirectory)
+import           System.Directory          (createDirectory,
+                                            getCurrentDirectory,
+                                            setCurrentDirectory)
 import           System.IO.Temp            (withSystemTempDirectory)
-import Test.Hspec (Spec, describe, it, around_)
+import           Test.Hspec                (Spec, around_, describe, it)
-import Test.Hspec.Wai (with, get, shouldRespondWith)
+import           Test.Hspec.Wai            (get, shouldRespondWith, with)
 
 import           Servant.API               (JSON)
 import           Servant.API.Alternative   ((:<|>) ((:<|>)))

servant/test/Servant/API/ContentTypesSpec.hs

@@ -12,13 +12,13 @@ import           Data.Monoid
 #endif
 import           Control.Arrow
 import           Data.Aeson
-import           Data.Either
-import           Data.Function              (on)
-import           Data.Proxy
 import           Data.ByteString.Char8     (ByteString, append, pack)
 import qualified Data.ByteString.Lazy      as BSL
+import           Data.Either
+import           Data.Function             (on)
 import           Data.List                 (maximumBy)
 import           Data.Maybe                (fromJust, isJust, isNothing)
+import           Data.Proxy
 import           Data.String               (IsString (..))
 import           Data.String.Conversions   (cs)
 import qualified Data.Text                 as TextS