From 6eb7add53a6b510a217a24f24ccda9ec9fe0955b Mon Sep 17 00:00:00 2001 From: "Julian K. Arni" Date: Mon, 17 Aug 2015 23:56:29 +0200 Subject: [PATCH] stylish haskell changes And import fix. --- servant-blaze/Setup.hs | 2 +- servant-client/Setup.hs | 2 +- servant-client/src/Servant/Common/BaseUrl.hs | 18 ++++----- .../test/Servant/Common/BaseUrlSpec.hs | 12 +++--- servant-client/test/Spec.hs | 2 +- servant-docs/Setup.hs | 2 +- servant-docs/src/Servant/Docs.hs | 2 +- servant-docs/src/Servant/Docs/Internal.hs | 4 +- servant-examples/Setup.hs | 2 +- .../auth-combinator/auth-combinator.hs | 30 +++++++-------- servant-examples/hackage/hackage.hs | 32 ++++++++-------- .../socket-io-chat/socket-io-chat.hs | 24 ++++++------ servant-examples/tutorial/T1.hs | 22 +++++------ servant-examples/tutorial/T10.hs | 24 ++++++------ servant-examples/tutorial/T2.hs | 20 +++++----- servant-examples/tutorial/T3.hs | 28 +++++++------- servant-examples/tutorial/T4.hs | 22 +++++------ servant-examples/tutorial/T5.hs | 22 +++++------ servant-examples/tutorial/T6.hs | 8 ++-- servant-examples/tutorial/T7.hs | 12 +++--- servant-examples/tutorial/T8.hs | 14 +++---- servant-examples/tutorial/T9.hs | 28 +++++++------- servant-examples/tutorial/t8-main.hs | 2 +- servant-examples/tutorial/tutorial.hs | 8 ++-- .../wai-middleware/wai-middleware.hs | 18 ++++----- servant-js/Setup.hs | 2 +- servant-js/examples/counter.hs | 32 ++++++++-------- servant-js/src/Servant/JS.hs | 22 +++++------ servant-js/src/Servant/JS/Angular.hs | 26 ++++++------- servant-js/src/Servant/JS/Axios.hs | 24 ++++++------ servant-js/src/Servant/JS/JQuery.hs | 8 ++-- servant-js/src/Servant/JS/Vanilla.hs | 8 ++-- servant-js/test/Servant/JSSpec.hs | 22 +++++------ .../test/Servant/JSSpec/CustomHeaders.hs | 14 +++---- servant-lucid/Setup.hs | 2 +- servant-mock/Setup.hs | 2 +- servant-mock/example/main.hs | 18 ++++----- servant-server/Setup.hs | 2 +- servant-server/example/greet.hs | 26 ++++++------- servant-server/src/Servant.hs | 12 +++--- servant-server/src/Servant/Server.hs | 4 +- servant-server/src/Servant/Server/Internal.hs | 2 +- .../src/Servant/Server/Internal/PathInfo.hs | 10 ++--- .../src/Servant/Server/Internal/Router.hs | 10 ++--- .../Server/Internal/RoutingApplication.hs | 33 ++++++++-------- .../src/Servant/Server/Internal/ServantErr.hs | 8 ++-- .../src/Servant/Utils/StaticFiles.hs | 11 +++--- servant-server/test/Doctests.hs | 2 +- .../test/Servant/Server/Internal/EnterSpec.hs | 8 ++-- .../test/Servant/Utils/StaticFilesSpec.hs | 38 ++++++++++--------- servant/Setup.hs | 2 +- servant/src/Servant/API.hs | 4 +- servant/src/Servant/API/Delete.hs | 2 +- servant/src/Servant/API/HttpVersion.hs | 2 +- servant/src/Servant/API/IsSecure.hs | 2 +- servant/src/Servant/API/Put.hs | 2 +- servant/src/Servant/API/Raw.hs | 2 +- servant/src/Servant/API/RemoteHost.hs | 2 +- servant/src/Servant/API/Vault.hs | 2 +- servant/test/Doctests.hs | 2 +- servant/test/Servant/API/ContentTypesSpec.hs | 22 +++++------ 61 files changed, 377 insertions(+), 373 deletions(-) diff --git a/servant-blaze/Setup.hs b/servant-blaze/Setup.hs index 9a994af6..44671092 100644 --- a/servant-blaze/Setup.hs +++ b/servant-blaze/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/servant-client/Setup.hs b/servant-client/Setup.hs index 9a994af6..44671092 100644 --- a/servant-client/Setup.hs +++ b/servant-client/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/servant-client/src/Servant/Common/BaseUrl.hs b/servant-client/src/Servant/Common/BaseUrl.hs index f8cc61e2..666595d1 100644 --- a/servant-client/src/Servant/Common/BaseUrl.hs +++ b/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 diff --git a/servant-client/test/Servant/Common/BaseUrlSpec.hs b/servant-client/test/Servant/Common/BaseUrlSpec.hs index 2a1ea751..cf615f9c 100644 --- a/servant-client/test/Servant/Common/BaseUrlSpec.hs +++ b/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 diff --git a/servant-client/test/Spec.hs b/servant-client/test/Spec.hs index e913fcc4..97681f8d 100644 --- a/servant-client/test/Spec.hs +++ b/servant-client/test/Spec.hs @@ -1,4 +1,4 @@ -import Servant.ClientSpec (spec, failSpec) +import Servant.ClientSpec (failSpec, spec) main :: IO () main = do diff --git a/servant-docs/Setup.hs b/servant-docs/Setup.hs index 9a994af6..44671092 100644 --- a/servant-docs/Setup.hs +++ b/servant-docs/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/servant-docs/src/Servant/Docs.hs b/servant-docs/src/Servant/Docs.hs index 14f116d1..e12d52f9 100644 --- a/servant-docs/src/Servant/Docs.hs +++ b/servant-docs/src/Servant/Docs.hs @@ -166,4 +166,4 @@ module Servant.Docs , single ) where -import Servant.Docs.Internal +import Servant.Docs.Internal diff --git a/servant-docs/src/Servant/Docs/Internal.hs b/servant-docs/src/Servant/Docs/Internal.hs index e4dcbd60..2170398b 100644 --- a/servant-docs/src/Servant/Docs/Internal.hs +++ b/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) diff --git a/servant-examples/Setup.hs b/servant-examples/Setup.hs index 9a994af6..44671092 100644 --- a/servant-examples/Setup.hs +++ b/servant-examples/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/servant-examples/auth-combinator/auth-combinator.hs b/servant-examples/auth-combinator/auth-combinator.hs index d1a11439..c82510f3 100644 --- a/servant-examples/auth-combinator/auth-combinator.hs +++ b/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 diff --git a/servant-examples/hackage/hackage.hs b/servant-examples/hackage/hackage.hs index e205fc12..d656cfd5 100644 --- a/servant-examples/hackage/hackage.hs +++ b/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 +{-# 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 +import qualified Data.Text as T +import qualified Data.Text.IO as T type HackageAPI = "users" :> Get '[JSON] [UserSummary] diff --git a/servant-examples/socket-io-chat/socket-io-chat.hs b/servant-examples/socket-io-chat/socket-io-chat.hs index 63b33749..1250d8fe 100644 --- a/servant-examples/socket-io-chat/socket-io-chat.hs +++ b/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 diff --git a/servant-examples/tutorial/T1.hs b/servant-examples/tutorial/T1.hs index 9fb93c8c..491465ea 100644 --- a/servant-examples/tutorial/T1.hs +++ b/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 "isaac@newton.co.uk" (fromGregorian 1683 3 1) , User "Albert Einstein" 136 "ae@mc2.org" (fromGregorian 1905 12 1) ] diff --git a/servant-examples/tutorial/T10.hs b/servant-examples/tutorial/T10.hs index 39e48e04..206e72e4 100644 --- a/servant-examples/tutorial/T10.hs +++ b/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 diff --git a/servant-examples/tutorial/T2.hs b/servant-examples/tutorial/T2.hs index 69ded18c..72aca76a 100644 --- a/servant-examples/tutorial/T2.hs +++ b/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) diff --git a/servant-examples/tutorial/T3.hs b/servant-examples/tutorial/T3.hs index dcff930b..e8134fde 100644 --- a/servant-examples/tutorial/T3.hs +++ b/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,9 +26,9 @@ 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) @@ -36,10 +36,10 @@ 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 diff --git a/servant-examples/tutorial/T4.hs b/servant-examples/tutorial/T4.hs index 94f8df73..69cbf951 100644 --- a/servant-examples/tutorial/T4.hs +++ b/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 diff --git a/servant-examples/tutorial/T5.hs b/servant-examples/tutorial/T5.hs index 0811fd9b..326bd546 100644 --- a/servant-examples/tutorial/T5.hs +++ b/servant-examples/tutorial/T5.hs @@ -1,17 +1,17 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE TypeOperators #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} module T5 where -import Control.Monad.IO.Class -import Control.Monad.Trans.Either -import Data.Aeson -import GHC.Generics -import Network.Wai -import Servant -import System.Directory +import Control.Monad.IO.Class +import Control.Monad.Trans.Either +import Data.Aeson +import GHC.Generics +import Network.Wai +import Servant +import System.Directory type IOAPI = "myfile.txt" :> Get '[JSON] FileContent diff --git a/servant-examples/tutorial/T6.hs b/servant-examples/tutorial/T6.hs index c0abb1df..781bf703 100644 --- a/servant-examples/tutorial/T6.hs +++ b/servant-examples/tutorial/T6.hs @@ -1,10 +1,10 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} module T6 where -import Network.Wai -import Servant +import Network.Wai +import Servant type API = "code" :> Raw diff --git a/servant-examples/tutorial/T7.hs b/servant-examples/tutorial/T7.hs index d67cfcd4..5dbaa1d9 100644 --- a/servant-examples/tutorial/T7.hs +++ b/servant-examples/tutorial/T7.hs @@ -1,12 +1,12 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} module T7 where -import Control.Monad.Trans.Either -import Control.Monad.Trans.Reader -import Network.Wai -import Servant +import Control.Monad.Trans.Either +import Control.Monad.Trans.Reader +import Network.Wai +import Servant type ReaderAPI = "a" :> Get '[JSON] Int :<|> "b" :> Get '[JSON] String diff --git a/servant-examples/tutorial/T8.hs b/servant-examples/tutorial/T8.hs index 089702bc..331cb831 100644 --- a/servant-examples/tutorial/T8.hs +++ b/servant-examples/tutorial/T8.hs @@ -1,14 +1,14 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} module T8 where -import Control.Monad.Trans.Either -import Data.Aeson -import Servant -import Servant.Client +import Control.Monad.Trans.Either +import Data.Aeson +import Servant +import Servant.Client -import T3 +import T3 position :: Int -- ^ value for "x" -> Int -- ^ value for "y" diff --git a/servant-examples/tutorial/T9.hs b/servant-examples/tutorial/T9.hs index 140f48d6..08545228 100644 --- a/servant-examples/tutorial/T9.hs +++ b/servant-examples/tutorial/T9.hs @@ -1,20 +1,20 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE TypeOperators #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} module T9 where -import Control.Applicative -import Control.Monad.IO.Class -import Data.Aeson -import Data.Text (Text) -import GHC.Generics -import Network.Wai -import Servant -import Servant.JS -import Servant.JS.JQuery -import System.Random +import Control.Applicative +import Control.Monad.IO.Class +import Data.Aeson +import Data.Text (Text) +import GHC.Generics +import Network.Wai +import Servant +import Servant.JS +import Servant.JS.JQuery +import System.Random import qualified Data.Text as T import qualified Language.Javascript.JQuery as JQ diff --git a/servant-examples/tutorial/t8-main.hs b/servant-examples/tutorial/t8-main.hs index b70d5a61..b0e4979d 100644 --- a/servant-examples/tutorial/t8-main.hs +++ b/servant-examples/tutorial/t8-main.hs @@ -1,4 +1,4 @@ -import T8 +import T8 main :: IO () main = run diff --git a/servant-examples/tutorial/tutorial.hs b/servant-examples/tutorial/tutorial.hs index 55f0408b..32dc4c06 100644 --- a/servant-examples/tutorial/tutorial.hs +++ b/servant-examples/tutorial/tutorial.hs @@ -1,8 +1,9 @@ -import Network.Wai -import Network.Wai.Handler.Warp -import System.Environment +import Network.Wai +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 diff --git a/servant-examples/wai-middleware/wai-middleware.hs b/servant-examples/wai-middleware/wai-middleware.hs index ef772665..d625d092 100644 --- a/servant-examples/wai-middleware/wai-middleware.hs +++ b/servant-examples/wai-middleware/wai-middleware.hs @@ -1,13 +1,13 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} -import Data.Aeson -import Data.Text -import GHC.Generics -import Network.Wai -import Network.Wai.Handler.Warp -import Network.Wai.Middleware.RequestLogger -import Servant +import Data.Aeson +import Data.Text +import GHC.Generics +import Network.Wai +import Network.Wai.Handler.Warp +import Network.Wai.Middleware.RequestLogger +import Servant data Product = Product { name :: Text diff --git a/servant-js/Setup.hs b/servant-js/Setup.hs index 9a994af6..44671092 100644 --- a/servant-js/Setup.hs +++ b/servant-js/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/servant-js/examples/counter.hs b/servant-js/examples/counter.hs index 5462b6f2..5d2b80d0 100644 --- a/servant-js/examples/counter.hs +++ b/servant-js/examples/counter.hs @@ -1,19 +1,19 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE TypeOperators #-} -import Control.Concurrent.STM -import Control.Monad.IO.Class -import Data.Aeson -import Data.Proxy -import GHC.Generics -import Network.Wai.Handler.Warp (run) -import Servant -import Servant.JS -import qualified Servant.JS as SJS -import qualified Servant.JS.Angular as NG -import System.FilePath +import Control.Concurrent.STM +import Control.Monad.IO.Class +import Data.Aeson +import Data.Proxy +import GHC.Generics +import Network.Wai.Handler.Warp (run) +import Servant +import Servant.JS +import qualified Servant.JS as SJS +import qualified Servant.JS.Angular as NG +import System.FilePath -- * A simple Counter data type newtype Counter = Counter { value :: Int } @@ -43,7 +43,7 @@ type TestApi = "counter" :> Post '[JSON] Counter -- endpoint for increasing the :<|> "counter" :> Get '[JSON] Counter -- endpoint to get the current value type TestApi' = TestApi - :<|> Raw -- used for serving static files + :<|> Raw -- used for serving static files -- this proxy only targets the proper endpoints of our API, -- not the static file serving bit @@ -82,7 +82,7 @@ writeServiceJS fp = (defCommonGeneratorOptions { SJS.moduleName = "counterApp" }) ) fp - + main :: IO () main = do -- write the JS code to www/api.js at startup diff --git a/servant-js/src/Servant/JS.hs b/servant-js/src/Servant/JS.hs index 383b9c46..0e989824 100644 --- a/servant-js/src/Servant/JS.hs +++ b/servant-js/src/Servant/JS.hs @@ -1,7 +1,7 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE TypeOperators #-} ----------------------------------------------------------------------------- -- | -- Module : Servant.JS @@ -114,13 +114,13 @@ module Servant.JS , AjaxReq ) where -import Data.Proxy -import Servant.API -import Servant.JS.Angular -import Servant.JS.Axios -import Servant.JS.Internal -import Servant.JS.JQuery -import Servant.JS.Vanilla +import Data.Proxy +import Servant.API +import Servant.JS.Angular +import Servant.JS.Axios +import Servant.JS.Internal +import Servant.JS.JQuery +import Servant.JS.Vanilla -- | Generate the data necessary to generate javascript code -- for all the endpoints of an API, as ':<|>'-separated values @@ -160,6 +160,6 @@ instance (GenerateList start, GenerateList rest) => GenerateList (start :<|> res generateList (start :<|> rest) = (generateList start) ++ (generateList rest) -- | Generate the necessary data for JS codegen as a list, each 'AjaxReq' --- describing one endpoint from your API type. +-- describing one endpoint from your API type. listFromAPI :: (HasJS api, GenerateList (JS api)) => Proxy api -> [AjaxReq] listFromAPI p = generateList (javascript p) diff --git a/servant-js/src/Servant/JS/Angular.hs b/servant-js/src/Servant/JS/Angular.hs index a61747fa..7b93dfdf 100644 --- a/servant-js/src/Servant/JS/Angular.hs +++ b/servant-js/src/Servant/JS/Angular.hs @@ -1,16 +1,16 @@ module Servant.JS.Angular where -import Servant.JS.Internal -import Control.Lens -import Data.List -import Data.Monoid +import Control.Lens +import Data.List +import Data.Monoid +import Servant.JS.Internal -- | Options specific to the angular code generator data AngularOptions = AngularOptions { serviceName :: String -- ^ When generating code with wrapInService, -- name of the service to generate - , prologue :: String -> String -> String -- ^ beginning of the service definition - , epilogue :: String -- ^ end of the service definition + , prologue :: String -> String -> String -- ^ beginning of the service definition + , epilogue :: String -- ^ end of the service definition } -- | Default options for the Angular codegen. Used by 'wrapInService'. @@ -31,7 +31,7 @@ angularService ngOpts = angularServiceWith ngOpts defCommonGeneratorOptions -- | Instead of simply generating top level functions, generates a service instance -- on which your controllers can depend to access your API angularServiceWith :: AngularOptions -> CommonGeneratorOptions -> JavaScriptGenerator -angularServiceWith ngOpts opts reqs = +angularServiceWith ngOpts opts reqs = prologue ngOpts svc mName <> intercalate "," (map generator reqs) <> epilogue ngOpts @@ -54,7 +54,7 @@ angularWith ngopts opts = intercalate "\n\n" . map (generateAngularJSWith ngopts -- | js codegen using $http service from Angular using default options generateAngularJS :: AngularOptions -> AjaxReq -> String generateAngularJS ngOpts = generateAngularJSWith ngOpts defCommonGeneratorOptions - + -- | js codegen using $http service from Angular generateAngularJSWith :: AngularOptions -> CommonGeneratorOptions -> AjaxReq -> String generateAngularJSWith ngOptions opts req = "\n" <> @@ -74,7 +74,7 @@ generateAngularJSWith ngOptions opts req = "\n" <> ++ map (view argName) queryparams ++ body ++ map (toValidFunctionName . (<>) "header" . headerArgName) hs - + -- If we want to generate Top Level Function, they must depend on -- the $http service, if we generate a service, the functions will -- inherit this dependency from the service @@ -118,13 +118,13 @@ generateAngularJSWith ngOptions opts req = "\n" <> else (moduleName opts) <> "." where hasNoModule = null (moduleName opts) - + hasService = not $ null (serviceName ngOptions) - + fsep = if hasService then ":" else " =" - + fname = namespace <> (functionNameBuilder opts $ req ^. funcName) - + method = req ^. reqMethod url = if url' == "'" then "'/'" else url' url' = "'" diff --git a/servant-js/src/Servant/JS/Axios.hs b/servant-js/src/Servant/JS/Axios.hs index bd62f80f..3d65480b 100644 --- a/servant-js/src/Servant/JS/Axios.hs +++ b/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 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 @@ -13,9 +13,9 @@ data AxiosOptions = AxiosOptions -- should be made using credentials withCredentials :: !Bool -- | the name of the cookie to use as a value for xsrf token - , xsrfCookieName :: !(Maybe String) + , xsrfCookieName :: !(Maybe String) -- | the name of the header to use as a value for xsrf token - , xsrfHeaderName :: !(Maybe String) + , xsrfHeaderName :: !(Maybe String) } -- | Default instance of the AxiosOptions @@ -40,7 +40,7 @@ axiosWith aopts opts = intercalate "\n\n" . map (generateAxiosJSWith aopts opts) -- | js codegen using axios library using default options generateAxiosJS :: AxiosOptions -> AjaxReq -> String generateAxiosJS aopts = generateAxiosJSWith aopts defCommonGeneratorOptions - + -- | js codegen using axios library generateAxiosJSWith :: AxiosOptions -> CommonGeneratorOptions -> AjaxReq -> String generateAxiosJSWith aopts opts req = "\n" <> @@ -61,7 +61,7 @@ generateAxiosJSWith aopts opts req = "\n" <> ++ map (view argName) queryparams ++ body ++ map (toValidFunctionName . (<>) "header" . headerArgName) hs - + captures = map captureArg . filter isCapture $ req ^. reqUrl.path @@ -85,7 +85,7 @@ generateAxiosJSWith aopts opts req = "\n" <> then " , withCredentials: true\n" else "" - xsrfCookie = + xsrfCookie = case xsrfCookieName aopts of Just name -> " , xsrfCookieName: '" <> name <> "'\n" Nothing -> "" @@ -111,9 +111,9 @@ generateAxiosJSWith aopts opts req = "\n" <> else (moduleName opts) <> "." where hasNoModule = null (moduleName opts) - + fname = namespace <> (functionNameBuilder opts $ req ^. funcName) - + method = map toLower $ req ^. reqMethod url = if url' == "'" then "'/'" else url' url' = "'" diff --git a/servant-js/src/Servant/JS/JQuery.hs b/servant-js/src/Servant/JS/JQuery.hs index 97831573..e85f1e7d 100644 --- a/servant-js/src/Servant/JS/JQuery.hs +++ b/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 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' diff --git a/servant-js/src/Servant/JS/Vanilla.hs b/servant-js/src/Servant/JS/Vanilla.hs index b03d4cac..13378dcc 100644 --- a/servant-js/src/Servant/JS/Vanilla.hs +++ b/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 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' diff --git a/servant-js/test/Servant/JSSpec.hs b/servant-js/test/Servant/JSSpec.hs index 38670bc3..46ea2e1c 100644 --- a/servant-js/test/Servant/JSSpec.hs +++ b/servant-js/test/Servant/JSSpec.hs @@ -7,18 +7,18 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} module Servant.JSSpec where -import Data.Either (isRight) -import Data.Proxy -import Language.ECMAScript3.Parser (parseFromString) -import Test.Hspec +import Data.Either (isRight) +import Data.Proxy +import Language.ECMAScript3.Parser (parseFromString) +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 Servant.JSSpec.CustomHeaders +import Servant.API +import Servant.JS +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 :<|> "has.extension" :> Get '[FormUrlEncoded,JSON] Bool diff --git a/servant-js/test/Servant/JSSpec/CustomHeaders.hs b/servant-js/test/Servant/JSSpec/CustomHeaders.hs index af89d174..64a27306 100644 --- a/servant-js/test/Servant/JSSpec/CustomHeaders.hs +++ b/servant-js/test/Servant/JSSpec/CustomHeaders.hs @@ -8,13 +8,13 @@ module Servant.JSSpec.CustomHeaders where -import Control.Lens -import Data.Monoid -import Data.Proxy -import GHC.TypeLits -import Servant.API -import Servant.JS -import Servant.JS.Internal +import Control.Lens +import Data.Monoid +import Data.Proxy +import GHC.TypeLits +import Servant.API +import Servant.JS +import Servant.JS.Internal -- | This is a hypothetical combinator that fetches an Authorization header. -- The symbol in the header denotes what kind of authentication we are diff --git a/servant-lucid/Setup.hs b/servant-lucid/Setup.hs index 9a994af6..44671092 100644 --- a/servant-lucid/Setup.hs +++ b/servant-lucid/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/servant-mock/Setup.hs b/servant-mock/Setup.hs index 9a994af6..44671092 100644 --- a/servant-mock/Setup.hs +++ b/servant-mock/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/servant-mock/example/main.hs b/servant-mock/example/main.hs index 93398c4c..51ba7329 100644 --- a/servant-mock/example/main.hs +++ b/servant-mock/example/main.hs @@ -1,13 +1,13 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} -import Data.Aeson -import GHC.Generics -import Network.Wai.Handler.Warp -import Servant -import Servant.Mock -import Test.QuickCheck.Arbitrary +{-# LANGUAGE TypeOperators #-} +import Data.Aeson +import GHC.Generics +import Network.Wai.Handler.Warp +import Servant +import Servant.Mock +import Test.QuickCheck.Arbitrary newtype User = User { username :: String } deriving (Eq, Show, Arbitrary, Generic) diff --git a/servant-server/Setup.hs b/servant-server/Setup.hs index 9a994af6..44671092 100644 --- a/servant-server/Setup.hs +++ b/servant-server/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/servant-server/example/greet.hs b/servant-server/example/greet.hs index cd8bd138..1d5603cc 100644 --- a/servant-server/example/greet.hs +++ b/servant-server/example/greet.hs @@ -1,19 +1,19 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE PolyKinds #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE TypeOperators #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} -import Data.Aeson -import Data.Monoid -import Data.Proxy -import Data.Text -import GHC.Generics -import Network.Wai -import Network.Wai.Handler.Warp +import Data.Aeson +import Data.Monoid +import Data.Proxy +import Data.Text +import GHC.Generics +import Network.Wai +import Network.Wai.Handler.Warp -import Servant +import Servant -- * Example diff --git a/servant-server/src/Servant.hs b/servant-server/src/Servant.hs index 38671f34..ae4679fe 100644 --- a/servant-server/src/Servant.hs +++ b/servant-server/src/Servant.hs @@ -14,9 +14,9 @@ module Servant ( Proxy(..), ) where -import Data.Proxy -import Servant.API -import Servant.Common.Text -import Servant.Server -import Servant.Utils.Links -import Servant.Utils.StaticFiles +import Data.Proxy +import Servant.API +import Servant.Common.Text +import Servant.Server +import Servant.Utils.Links +import Servant.Utils.StaticFiles diff --git a/servant-server/src/Servant/Server.hs b/servant-server/src/Servant/Server.hs index fcf02f1a..e560780b 100644 --- a/servant-server/src/Servant/Server.hs +++ b/servant-server/src/Servant/Server.hs @@ -77,8 +77,8 @@ module Servant.Server ) where -import Data.Proxy (Proxy) -import Network.Wai (Application) +import Data.Proxy (Proxy) +import Network.Wai (Application) import Servant.Server.Internal import Servant.Server.Internal.Enter diff --git a/servant-server/src/Servant/Server/Internal.hs b/servant-server/src/Servant/Server/Internal.hs index 9db11353..2409ce6d 100644 --- a/servant-server/src/Servant/Server/Internal.hs +++ b/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) diff --git a/servant-server/src/Servant/Server/Internal/PathInfo.hs b/servant-server/src/Servant/Server/Internal/PathInfo.hs index 0138f72e..454516f0 100644 --- a/servant-server/src/Servant/Server/Internal/PathInfo.hs +++ b/servant-server/src/Servant/Server/Internal/PathInfo.hs @@ -1,10 +1,10 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings #-} module Servant.Server.Internal.PathInfo where -import Data.List (unfoldr) -import Data.Text (Text) -import qualified Data.Text as T -import Network.Wai (Request, pathInfo) +import Data.List (unfoldr) +import Data.Text (Text) +import qualified Data.Text as T +import Network.Wai (Request, pathInfo) -- | Like `null . pathInfo`, but works with redundant trailing slashes. pathIsEmpty :: Request -> Bool diff --git a/servant-server/src/Servant/Server/Internal/Router.hs b/servant-server/src/Servant/Server/Internal/Router.hs index 2e0188e4..f188955e 100644 --- a/servant-server/src/Servant/Server/Internal/Router.hs +++ b/servant-server/src/Servant/Server/Internal/Router.hs @@ -1,10 +1,10 @@ module Servant.Server.Internal.Router where -import Data.Map (Map) -import qualified Data.Map as M -import Data.Monoid ((<>)) -import Data.Text (Text) -import Network.Wai (Request, pathInfo) +import Data.Map (Map) +import qualified Data.Map as M +import Data.Monoid ((<>)) +import Data.Text (Text) +import Network.Wai (Request, pathInfo) import Servant.Server.Internal.PathInfo import Servant.Server.Internal.RoutingApplication diff --git a/servant-server/src/Servant/Server/Internal/RoutingApplication.hs b/servant-server/src/Servant/Server/Internal/RoutingApplication.hs index 415fff2b..e1ab3546 100644 --- a/servant-server/src/Servant/Server/Internal/RoutingApplication.hs +++ b/servant-server/src/Servant/Server/Internal/RoutingApplication.hs @@ -5,23 +5,24 @@ module Servant.Server.Internal.RoutingApplication where #if !MIN_VERSION_base(4,8,0) -import Control.Applicative (Applicative, (<$>)) -import Data.Monoid (Monoid, mappend, mempty) +import Control.Applicative (Applicative, (<$>)) +import Data.Monoid (Monoid, mappend, mempty) #endif -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.Maybe (fromMaybe) -import Data.Monoid ((<>)) -import Data.String (fromString) -import Network.HTTP.Types hiding (Header, ResponseHeaders) -import Network.Wai (Application, Request, Response, - ResponseReceived, - requestBody, - responseLBS, - strictRequestBody) -import Servant.API ((:<|>) (..)) +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.Maybe (fromMaybe) +import Data.Monoid ((<>)) +import Data.String (fromString) +import Network.HTTP.Types hiding (Header, + ResponseHeaders) +import Network.Wai (Application, Request, + Response, ResponseReceived, + requestBody, responseLBS, + strictRequestBody) +import Servant.API ((:<|>) (..)) import Servant.Server.Internal.ServantErr type RoutingApplication = diff --git a/servant-server/src/Servant/Server/Internal/ServantErr.hs b/servant-server/src/Servant/Server/Internal/ServantErr.hs index b29a0618..a308022e 100644 --- a/servant-server/src/Servant/Server/Internal/ServantErr.hs +++ b/servant-server/src/Servant/Server/Internal/ServantErr.hs @@ -2,10 +2,10 @@ {-# LANGUAGE RecordWildCards #-} 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 qualified Data.ByteString.Char8 as BS +import qualified Data.ByteString.Lazy as LBS +import qualified Network.HTTP.Types as HTTP +import Network.Wai (Response, responseLBS) data ServantErr = ServantErr { errHTTPCode :: Int , errReasonPhrase :: String diff --git a/servant-server/src/Servant/Utils/StaticFiles.hs b/servant-server/src/Servant/Utils/StaticFiles.hs index 203c27f3..08d01ada 100644 --- a/servant-server/src/Servant/Utils/StaticFiles.hs +++ b/servant-server/src/Servant/Utils/StaticFiles.hs @@ -7,12 +7,13 @@ module Servant.Utils.StaticFiles ( serveDirectory, ) where -import System.FilePath (addTrailingPathSeparator) -import Network.Wai.Application.Static (staticApp, defaultFileServerSettings) -import Servant.API.Raw (Raw) -import Servant.Server (Server) +import Network.Wai.Application.Static (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) +import Filesystem.Path.CurrentOS (decodeString) #endif -- | Serve anything under the specified directory as a 'Raw' endpoint. diff --git a/servant-server/test/Doctests.hs b/servant-server/test/Doctests.hs index 0227abc0..572461aa 100644 --- a/servant-server/test/Doctests.hs +++ b/servant-server/test/Doctests.hs @@ -1,6 +1,6 @@ module Main where -import Data.List (isPrefixOf) +import Data.List (isPrefixOf) import System.Directory import System.FilePath import System.FilePath.Find diff --git a/servant-server/test/Servant/Server/Internal/EnterSpec.hs b/servant-server/test/Servant/Server/Internal/EnterSpec.hs index 992e7bf4..fbc33aa5 100644 --- a/servant-server/test/Servant/Server/Internal/EnterSpec.hs +++ b/servant-server/test/Servant/Server/Internal/EnterSpec.hs @@ -3,16 +3,16 @@ {-# LANGUAGE TypeOperators #-} module Servant.Server.Internal.EnterSpec where -import qualified Control.Category as C +import qualified Control.Category as C import Control.Monad.Reader import Control.Monad.Trans.Either import Data.Proxy import Servant.API import Servant.Server -import Test.Hspec (Spec, describe, it) -import Test.Hspec.Wai (get, matchStatus, post, - shouldRespondWith, with) +import Test.Hspec (Spec, describe, it) +import Test.Hspec.Wai (get, matchStatus, post, + shouldRespondWith, with) spec :: Spec spec = describe "module Servant.Server.Enter" $ do diff --git a/servant-server/test/Servant/Utils/StaticFilesSpec.hs b/servant-server/test/Servant/Utils/StaticFilesSpec.hs index 4d4b2420..3630b313 100644 --- a/servant-server/test/Servant/Utils/StaticFilesSpec.hs +++ b/servant-server/test/Servant/Utils/StaticFilesSpec.hs @@ -1,27 +1,29 @@ -{-# LANGUAGE DataKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeOperators #-} +{-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -fno-warn-orphans #-} 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.IO.Temp (withSystemTempDirectory) -import Test.Hspec (Spec, describe, it, around_) -import Test.Hspec.Wai (with, get, shouldRespondWith) +import Control.Exception (bracket) +import Data.Proxy (Proxy (Proxy)) +import Network.Wai (Application) +import System.Directory (createDirectory, + getCurrentDirectory, + setCurrentDirectory) +import System.IO.Temp (withSystemTempDirectory) +import Test.Hspec (Spec, around_, describe, it) +import Test.Hspec.Wai (get, shouldRespondWith, with) -import Servant.API (JSON) -import Servant.API.Alternative ((:<|>)((:<|>))) -import Servant.API.Capture (Capture) -import Servant.API.Get (Get) -import Servant.API.Raw (Raw) -import Servant.API.Sub ((:>)) -import Servant.Server (Server, serve) -import Servant.ServerSpec (Person(Person)) -import Servant.Utils.StaticFiles (serveDirectory) +import Servant.API (JSON) +import Servant.API.Alternative ((:<|>) ((:<|>))) +import Servant.API.Capture (Capture) +import Servant.API.Get (Get) +import Servant.API.Raw (Raw) +import Servant.API.Sub ((:>)) +import Servant.Server (Server, serve) +import Servant.ServerSpec (Person (Person)) +import Servant.Utils.StaticFiles (serveDirectory) type Api = "dummy_api" :> Capture "person_name" String :> Get '[JSON] Person diff --git a/servant/Setup.hs b/servant/Setup.hs index 9a994af6..44671092 100644 --- a/servant/Setup.hs +++ b/servant/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/servant/src/Servant/API.hs b/servant/src/Servant/API.hs index 9aba6322..0fa12093 100644 --- a/servant/src/Servant/API.hs +++ b/servant/src/Servant/API.hs @@ -69,8 +69,8 @@ import Servant.API.ContentTypes (Accept (..), FormUrlEncoded, import Servant.API.Delete (Delete) import Servant.API.Get (Get) import Servant.API.Header (Header (..)) -import Servant.API.HttpVersion (HttpVersion(..)) -import Servant.API.IsSecure (IsSecure(..)) +import Servant.API.HttpVersion (HttpVersion (..)) +import Servant.API.IsSecure (IsSecure (..)) import Servant.API.MatrixParam (MatrixFlag, MatrixParam, MatrixParams) import Servant.API.Patch (Patch) diff --git a/servant/src/Servant/API/Delete.hs b/servant/src/Servant/API/Delete.hs index 9bfb0166..0329066a 100644 --- a/servant/src/Servant/API/Delete.hs +++ b/servant/src/Servant/API/Delete.hs @@ -4,7 +4,7 @@ {-# OPTIONS_HADDOCK not-home #-} module Servant.API.Delete (Delete) where -import Data.Typeable ( Typeable ) +import Data.Typeable (Typeable) -- | Combinator for DELETE requests. -- diff --git a/servant/src/Servant/API/HttpVersion.hs b/servant/src/Servant/API/HttpVersion.hs index 407ae2db..23b682b9 100644 --- a/servant/src/Servant/API/HttpVersion.hs +++ b/servant/src/Servant/API/HttpVersion.hs @@ -3,7 +3,7 @@ module Servant.API.HttpVersion HttpVersion(..) ) where -import Network.HTTP.Types (HttpVersion(..)) +import Network.HTTP.Types (HttpVersion (..)) -- $httpversion -- diff --git a/servant/src/Servant/API/IsSecure.hs b/servant/src/Servant/API/IsSecure.hs index a2829200..031f94a7 100644 --- a/servant/src/Servant/API/IsSecure.hs +++ b/servant/src/Servant/API/IsSecure.hs @@ -4,7 +4,7 @@ module Servant.API.IsSecure IsSecure(..) ) where -import Data.Typeable +import Data.Typeable -- | Was this request made over an SSL connection? -- diff --git a/servant/src/Servant/API/Put.hs b/servant/src/Servant/API/Put.hs index 52bb81fa..0b09d961 100644 --- a/servant/src/Servant/API/Put.hs +++ b/servant/src/Servant/API/Put.hs @@ -4,7 +4,7 @@ {-# OPTIONS_HADDOCK not-home #-} module Servant.API.Put (Put) where -import Data.Typeable ( Typeable ) +import Data.Typeable (Typeable) -- | Endpoint for PUT requests, usually used to update a ressource. -- The type @a@ is the type of the response body that's returned. diff --git a/servant/src/Servant/API/Raw.hs b/servant/src/Servant/API/Raw.hs index 0d66bb43..90a5f4bd 100644 --- a/servant/src/Servant/API/Raw.hs +++ b/servant/src/Servant/API/Raw.hs @@ -2,7 +2,7 @@ {-# OPTIONS_HADDOCK not-home #-} module Servant.API.Raw where -import Data.Typeable (Typeable) +import Data.Typeable (Typeable) -- | Endpoint for plugging in your own Wai 'Application's. -- -- The given 'Application' will get the request as received by the server, potentially with diff --git a/servant/src/Servant/API/RemoteHost.hs b/servant/src/Servant/API/RemoteHost.hs index 961c3113..bf639d3b 100644 --- a/servant/src/Servant/API/RemoteHost.hs +++ b/servant/src/Servant/API/RemoteHost.hs @@ -4,7 +4,7 @@ module Servant.API.RemoteHost RemoteHost ) where -import Data.Typeable +import Data.Typeable -- | Provides access to the host or IP address -- from which the HTTP request was sent. diff --git a/servant/src/Servant/API/Vault.hs b/servant/src/Servant/API/Vault.hs index 3acdcf65..7a767b39 100644 --- a/servant/src/Servant/API/Vault.hs +++ b/servant/src/Servant/API/Vault.hs @@ -3,7 +3,7 @@ module Servant.API.Vault Vault ) where -import Data.Vault.Lazy (Vault) +import Data.Vault.Lazy (Vault) -- $vault -- diff --git a/servant/test/Doctests.hs b/servant/test/Doctests.hs index d70de8f3..4e528dd5 100644 --- a/servant/test/Doctests.hs +++ b/servant/test/Doctests.hs @@ -1,6 +1,6 @@ module Main where -import Data.List (isPrefixOf) +import Data.List (isPrefixOf) import System.Directory import System.FilePath import System.FilePath.Find diff --git a/servant/test/Servant/API/ContentTypesSpec.hs b/servant/test/Servant/API/ContentTypesSpec.hs index 85296ec5..76faea67 100644 --- a/servant/test/Servant/API/ContentTypesSpec.hs +++ b/servant/test/Servant/API/ContentTypesSpec.hs @@ -12,22 +12,22 @@ import Data.Monoid #endif import Control.Arrow import Data.Aeson +import Data.ByteString.Char8 (ByteString, append, pack) +import qualified Data.ByteString.Lazy as BSL import Data.Either -import Data.Function (on) +import Data.Function (on) +import Data.List (maximumBy) +import Data.Maybe (fromJust, isJust, isNothing) import Data.Proxy -import Data.ByteString.Char8 (ByteString, append, pack) -import qualified Data.ByteString.Lazy as BSL -import Data.List (maximumBy) -import Data.Maybe (fromJust, isJust, isNothing) -import Data.String (IsString (..)) -import Data.String.Conversions (cs) -import qualified Data.Text as TextS -import qualified Data.Text.Lazy as TextL +import Data.String (IsString (..)) +import Data.String.Conversions (cs) +import qualified Data.Text as TextS +import qualified Data.Text.Lazy as TextL import GHC.Generics -import Network.URL (exportParams, importParams) +import Network.URL (exportParams, importParams) import Test.Hspec import Test.QuickCheck -import Test.QuickCheck.Instances () +import Test.QuickCheck.Instances () import Servant.API.ContentTypes