stylish haskell changes

        And import fix.

servant-blaze/Setup.hs

@@ -1,2 +1,2 @@
-import Distribution.Simple
+import           Distribution.Simple
 main = defaultMain

servant-client/Setup.hs

@@ -1,2 +1,2 @@
-import Distribution.Simple
+import           Distribution.Simple
 main = defaultMain

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

@@ -11,13 +11,13 @@ module Servant.Common.BaseUrl (
   , showBaseUrl
 ) where
 
-import Control.Monad.Catch (MonadThrow, throwM, Exception)
-import Data.List
-import Data.Typeable
-import GHC.Generics
-import Network.URI
-import Safe
-import Text.Read
+import           Control.Monad.Catch (Exception, MonadThrow, throwM)
+import           Data.List
+import           Data.Typeable
+import           GHC.Generics
+import           Network.URI
+import           Safe
+import           Text.Read
 
 -- | URI scheme to use
 data Scheme =
@@ -29,8 +29,8 @@ data Scheme =
 --   for servant's automatically-generated clients.
 data BaseUrl = BaseUrl
   { baseUrlScheme :: Scheme -- ^ URI scheme to use
-  , baseUrlHost :: String   -- ^ host (eg "haskell.org")
-  , baseUrlPort :: Int      -- ^ port (eg 80)
+  , baseUrlHost   :: String   -- ^ host (eg "haskell.org")
+  , baseUrlPort   :: Int      -- ^ port (eg 80)
   } deriving (Show, Eq, Ord, Generic)
 
 showBaseUrl :: BaseUrl -> String

servant-client/test/Servant/Common/BaseUrlSpec.hs

@@ -1,15 +1,15 @@
-{-# LANGUAGE CPP                  #-}
+{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Servant.Common.BaseUrlSpec where
 
 #if !MIN_VERSION_base(4,8,0)
-import Control.Applicative
+import           Control.Applicative
 #endif
-import Control.DeepSeq
-import Test.Hspec
-import Test.QuickCheck
+import           Control.DeepSeq
+import           Test.Hspec
+import           Test.QuickCheck
 
-import Servant.Common.BaseUrl
+import           Servant.Common.BaseUrl
 
 spec :: Spec
 spec = do

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/Setup.hs

@@ -1,2 +1,2 @@
-import Distribution.Simple
+import           Distribution.Simple
 main = defaultMain

servant-docs/src/Servant/Docs.hs

@@ -166,4 +166,4 @@ module Servant.Docs
   , single
   ) where
 
-import Servant.Docs.Internal
+import           Servant.Docs.Internal

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/Setup.hs

@@ -1,2 +1,2 @@
-import Distribution.Simple
+import           Distribution.Simple
 main = defaultMain

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

@@ -1,19 +1,19 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DataKinds           #-}
+{-# LANGUAGE DeriveGeneric       #-}
+{-# LANGUAGE FlexibleInstances   #-}
+{-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-import Data.Aeson
-import Data.ByteString (ByteString)
-import Data.Text (Text)
-import GHC.Generics
-import Network.HTTP.Types
-import Network.Wai
-import Network.Wai.Handler.Warp
-import Servant
-import Servant.Server.Internal
+{-# LANGUAGE TypeFamilies        #-}
+{-# LANGUAGE TypeOperators       #-}
+import           Data.Aeson
+import           Data.ByteString          (ByteString)
+import           Data.Text                (Text)
+import           GHC.Generics
+import           Network.HTTP.Types
+import           Network.Wai
+import           Network.Wai.Handler.Warp
+import           Servant
+import           Servant.Server.Internal
 
 -- Pretty much stolen/adapted from
 -- https://github.com/haskell-servant/HaskellSGMeetup2015/blob/master/examples/authentication-combinator/AuthenticationCombinator.hs

servant-examples/hackage/hackage.hs

@@ -1,21 +1,21 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE DeriveGeneric     #-}
 {-# LANGUAGE OverloadedStrings #-}
-import Control.Applicative
-import Control.Monad
-import Control.Monad.IO.Class
-import Control.Monad.Trans.Either
-import Data.Aeson
-import Data.Monoid
-import Data.Proxy
-import Data.Text (Text)
-import GHC.Generics
-import Servant.API
-import Servant.Client
-
-import qualified Data.Text    as T
-import qualified Data.Text.IO as T
+{-# LANGUAGE TypeOperators     #-}
+import           Control.Applicative
+import           Control.Monad
+import           Control.Monad.IO.Class
+import           Control.Monad.Trans.Either
+import           Data.Aeson
+import           Data.Monoid
+import           Data.Proxy
+import           Data.Text                  (Text)
+import           GHC.Generics
+import           Servant.API
+import           Servant.Client
+
+import qualified Data.Text                  as T
+import qualified Data.Text.IO               as T
 
 type HackageAPI =
        "users" :> Get '[JSON] [UserSummary]

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

@@ -1,24 +1,24 @@
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE CPP               #-}
+{-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE TypeOperators     #-}
 
 
-import Data.Monoid ((<>))
+import           Data.Monoid              ((<>))
 #if !MIN_VERSION_base(4,8,0)
-import Control.Applicative((<$>))
+import           Control.Applicative      ((<$>))
 #endif
-import Network.Wai
-import Servant
-import Network.EngineIO.Wai
-import Network.Wai.Handler.Warp (run)
+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 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,19 +1,19 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DataKinds     #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeFamilies  #-}
 {-# LANGUAGE TypeOperators #-}
 module T1 where
 
-import Data.Aeson
-import Data.Time.Calendar
-import GHC.Generics
-import Network.Wai
-import Servant
+import           Data.Aeson
+import           Data.Time.Calendar
+import           GHC.Generics
+import           Network.Wai
+import           Servant
 
 data User = User
-  { name :: String
-  , age :: Int
-  , email :: String
+  { name              :: String
+  , age               :: Int
+  , email             :: String
   , registration_date :: Day
   } deriving (Eq, Show, Generic)
 
@@ -27,7 +27,7 @@ instance ToJSON User
 type UserAPI = "users" :> Get '[JSON] [User]
 
 users :: [User]
-users = 
+users =
   [ User "Isaac Newton"    372 "[email protected]" (fromGregorian 1683  3 1)
   , User "Albert Einstein" 136 "[email protected]"         (fromGregorian 1905 12 1)
   ]

servant-examples/tutorial/T10.hs

@@ -1,18 +1,18 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE FlexibleInstances     #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE TypeOperators         #-}
 module T10 where
 
-import Data.ByteString.Lazy (ByteString)
-import Data.Text.Lazy (pack)
-import Data.Text.Lazy.Encoding (encodeUtf8)
-import Network.HTTP.Types
-import Network.Wai
-import Servant
-import Servant.Docs
+import           Data.ByteString.Lazy    (ByteString)
+import           Data.Text.Lazy          (pack)
+import           Data.Text.Lazy.Encoding (encodeUtf8)
+import           Network.HTTP.Types
+import           Network.Wai
+import           Servant
+import           Servant.Docs
 import qualified T3
 
 type DocsAPI = T3.API :<|> Raw

servant-examples/tutorial/T2.hs

@@ -1,19 +1,19 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DataKinds     #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeFamilies  #-}
 {-# LANGUAGE TypeOperators #-}
 module T2 where
 
-import Data.Aeson
-import Data.Time.Calendar
-import GHC.Generics
-import Network.Wai
-import Servant
+import           Data.Aeson
+import           Data.Time.Calendar
+import           GHC.Generics
+import           Network.Wai
+import           Servant
 
 data User = User
-  { name :: String
-  , age :: Int
-  , email :: String
+  { name              :: String
+  , age               :: Int
+  , email             :: String
   , registration_date :: Day
   } deriving (Eq, Show, Generic)
 

servant-examples/tutorial/T3.hs

@@ -1,15 +1,15 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DataKinds     #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeFamilies  #-}
 {-# LANGUAGE TypeOperators #-}
 module T3 where
 
-import Control.Monad.Trans.Either
-import Data.Aeson
-import Data.List
-import GHC.Generics
-import Network.Wai
-import Servant
+import           Control.Monad.Trans.Either
+import           Data.Aeson
+import           Data.List
+import           GHC.Generics
+import           Network.Wai
+import           Servant
 
 data Position = Position
   { x :: Int
@@ -26,20 +26,20 @@ instance FromJSON HelloMessage
 instance ToJSON HelloMessage
 
 data ClientInfo = ClientInfo
-  { name :: String
-  , email :: String
-  , age :: Int
+  { name          :: String
+  , email         :: String
+  , age           :: Int
   , interested_in :: [String]
   } deriving (Show, Generic)
 
 instance FromJSON ClientInfo
 instance ToJSON ClientInfo
 
 data Email = Email
-  { from :: String
-  , to :: String
+  { from    :: String
+  , to      :: String
   , subject :: String
-  , body :: String
+  , body    :: String
   } deriving (Show, Generic)
 
 instance FromJSON Email

servant-examples/tutorial/T4.hs

@@ -1,18 +1,18 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE DataKinds         #-}
+{-# LANGUAGE DeriveGeneric     #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeFamilies      #-}
+{-# LANGUAGE TypeOperators     #-}
 module T4 where
 
-import Data.Aeson
-import Data.Foldable (foldMap)
-import GHC.Generics
-import Lucid
-import Network.Wai
-import Servant
-import Servant.HTML.Lucid
+import           Data.Aeson
+import           Data.Foldable      (foldMap)
+import           GHC.Generics
+import           Lucid
+import           Network.Wai
+import           Servant
+import           Servant.HTML.Lucid
 
 data Person = Person
   { firstName :: String