Use stylish-haskell 0.12.2.0

.stylish-haskell.yaml

@@ -238,6 +238,7 @@ language_extensions:
   - NamedFieldPuns
   - NoImplicitPrelude
   - OverloadedStrings
+  - PatternSynonyms
   - PolyKinds
   - RecordWildCards
   - ScopedTypeVariables

servant-util-beam-pg/src/Servant/Util/Beam/Postgres/Filtering.hs

@@ -37,17 +37,16 @@ module Servant.Util.Beam.Postgres.Filtering
 
 import Universum
 
+import Database.Beam.Backend.SQL (BeamSqlBackend, BeamSqlBackendIsString, BeamSqlBackendSyntax,
+                                  HasSqlValueSyntax, Sql92ExpressionValueSyntax,
+                                  Sql92SelectSelectTableSyntax, Sql92SelectTableExpressionSyntax)
 import Database.Beam.Backend.SQL.SQL92 (Sql92SelectSyntax)
-import Database.Beam.Backend.SQL (HasSqlValueSyntax,
-                                  Sql92ExpressionValueSyntax, BeamSqlBackendIsString, BeamSqlBackend,
-                                  Sql92SelectSelectTableSyntax, Sql92SelectTableExpressionSyntax,
-                                  BeamSqlBackendSyntax)
 import Database.Beam.Query (HasSqlEqualityCheck, Q, guard_, in_, like_, val_, (&&.), (/=.), (<.),
                             (<=.), (==.), (>.), (>=.))
 import Database.Beam.Query.Internal (QExpr)
 
-import Servant.Util.Combinators.Filtering.Base
 import Servant.Util.Combinators.Filtering.Backend
+import Servant.Util.Combinators.Filtering.Base
 import Servant.Util.Combinators.Filtering.Filters
 
 -- | Implements filters via Beam query expressions ('QExpr').
@@ -72,9 +71,9 @@ instance ( HasSqlEqualityCheck be a
          ) =>
          AutoFilterSupport (QExprFilterBackend be s) FilterMatching a where
     autoFilterSupport = \case
-        FilterMatching v -> (==. val_ v)
+        FilterMatching v    -> (==. val_ v)
         FilterNotMatching v -> (/=. val_ v)
-        FilterItemsIn vs -> (`in_` map val_ vs)
+        FilterItemsIn vs    -> (`in_` map val_ vs)
 
 instance ( BeamSqlBackend be
          , HasSqlValueSyntax
@@ -87,8 +86,8 @@ instance ( BeamSqlBackend be
          ) =>
          AutoFilterSupport (QExprFilterBackend be s) FilterComparing a where
     autoFilterSupport = \case
-        FilterGT v -> (>. val_ v)
-        FilterLT v -> (<. val_ v)
+        FilterGT v  -> (>. val_ v)
+        FilterLT v  -> (<. val_ v)
         FilterGTE v -> (>=. val_ v)
         FilterLTE v -> (<=. val_ v)
 
@@ -102,16 +101,16 @@ likeToSqlPattern = go . toString . unLikePattern
     go = \case
         Esc : '.' : r -> '.' : go r
         Esc : '*' : r -> '*' : go r
-        Esc : c : r -> Esc : c : go r
+        Esc : c : r   -> Esc : c : go r
 
-        '_' : r -> PgEsc : '_' : go r
-        '%' : r -> PgEsc : '%' : go r
+        '_' : r       -> PgEsc : '_' : go r
+        '%' : r       -> PgEsc : '%' : go r
 
-        '.' : r -> '_' : go r
-        '*' : r -> '%' : go r
+        '.' : r       -> '_' : go r
+        '*' : r       -> '%' : go r
 
-        c : r -> c : go r
-        [] -> []
+        c : r         -> c : go r
+        []            -> []
 
 instance ( IsString text
          , BeamSqlBackend be

servant-util/examples/Books.hs

@@ -4,11 +4,10 @@ import Universum
 
 import Data.Aeson (FromJSON, ToJSON)
 import Data.Aeson.TH (defaultOptions, deriveJSON)
-import Fmt ((+|), (|+))
-import Fmt (Buildable (..))
+import Fmt (Buildable (..), (+|), (|+))
 import qualified Network.Wai.Handler.Warp as Warp
-import Servant ((:<|>) (..), (:>), FromHttpApiData, Get, JSON, PostCreated, QueryParam, ReqBody,
-                Server, serve)
+import Servant (FromHttpApiData, Get, JSON, PostCreated, QueryParam, ReqBody, Server, serve,
+                (:<|>) (..), (:>))
 
 import Servant.Util
 

servant-util/src/Servant/Util/Combinators/ErrorResponses.hs

@@ -13,7 +13,7 @@ import Control.Lens (at, (<>~), (?~))
 import qualified Data.Swagger as S
 import Data.Swagger.Declare (runDeclare)
 import GHC.TypeLits (KnownSymbol, Symbol)
-import Servant ((:>), HasServer (..))
+import Servant (HasServer (..), (:>))
 import Servant.Client (HasClient (..))
 import Servant.Swagger (HasSwagger (..))
 

servant-util/src/Servant/Util/Combinators/Filtering/Base.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE TypeInType #-}
 {-# LANGUAGE DeriveFunctor #-}
+{-# LANGUAGE TypeInType    #-}
 
 module Servant.Util.Combinators.Filtering.Base
     ( FilterKind (..)
@@ -33,9 +33,9 @@ import Universum
 
 import qualified Data.Map as M
 import Data.Typeable (cast)
-import Fmt (Buildable (..),  Builder,)
-import Servant (FromHttpApiData(..), ToHttpApiData (..))
+import Fmt (Buildable (..), Builder)
 import GHC.Exts (IsList)
+import Servant (FromHttpApiData (..), ToHttpApiData (..))
 
 import Servant.Util.Common
 

servant-util/src/Servant/Util/Combinators/Filtering/Client.hs

@@ -6,7 +6,7 @@ import Universum hiding (filter)
 
 import Data.Typeable (cast)
 import GHC.TypeLits (KnownSymbol)
-import Servant ((:>), ToHttpApiData (..), toQueryParam)
+import Servant (ToHttpApiData (..), toQueryParam, (:>))
 import Servant.Client (HasClient (..))
 import Servant.Client.Core.Request (Request, appendToQueryString)
 
@@ -22,7 +22,7 @@ import Servant.Util.Common
 typeFilterToReq :: ToHttpApiData a => TypeFilter fk a -> (Text, Text)
 typeFilterToReq = \case
     TypeAutoFilter (SomeTypeAutoFilter filter) -> autoFilterEncode filter
-    TypeManualFilter val -> (DefFilteringCmd, toQueryParam val)
+    TypeManualFilter val                       -> (DefFilteringCmd, toQueryParam val)
 
 -- | Apply filter to a client request being built.
 class SomeFilterToReq params where

servant-util/src/Servant/Util/Combinators/Filtering/Filters/General.hs

@@ -27,9 +27,9 @@ data FilterMatching a
 
 instance BuildableAutoFilter FilterMatching where
     buildAutoFilter name = \case
-        FilterMatching v -> build name <> " = " <> build v
+        FilterMatching v    -> build name <> " = " <> build v
         FilterNotMatching v -> build name <> " /= " <> build v
-        FilterItemsIn v -> build name <> " ∊ " <> listF v
+        FilterItemsIn v     -> build name <> " ∊ " <> listF v
 
 instance IsAutoFilter FilterMatching where
     autoFilterEnglishOpsNames =
@@ -57,9 +57,9 @@ instance IsAutoFilter FilterMatching where
             mapM parseUrlPiece vals
 
     autoFilterEncode = \case
-        FilterMatching v -> (DefFilteringCmd, toQueryParam v)
+        FilterMatching v    -> (DefFilteringCmd, toQueryParam v)
         FilterNotMatching v -> ("neq", toQueryParam v)
-        FilterItemsIn vs -> ("in", "[" <> T.intercalate "," (map toQueryParam vs) <> "]")
+        FilterItemsIn vs    -> ("in", "[" <> T.intercalate "," (map toQueryParam vs) <> "]")
 
 
 -- | Support for @(<)@, @(>)@, @(<=)@ and @(>=)@ operations.
@@ -72,8 +72,8 @@ data FilterComparing a
 
 instance BuildableAutoFilter FilterComparing where
     buildAutoFilter name = \case
-        FilterGT v -> build name <> " > " <> build v
-        FilterLT v -> build name <> " < " <> build v
+        FilterGT v  -> build name <> " > " <> build v
+        FilterLT v  -> build name <> " < " <> build v
         FilterGTE v -> build name <> " >= " <> build v
         FilterLTE v -> build name <> " <= " <> build v
 
@@ -101,8 +101,8 @@ instance IsAutoFilter FilterComparing where
         ]
 
     autoFilterEncode = \case
-        FilterGT v -> ("gt", toQueryParam v)
-        FilterLT v -> ("lt", toQueryParam v)
+        FilterGT v  -> ("gt", toQueryParam v)
+        FilterLT v  -> ("lt", toQueryParam v)
         FilterGTE v -> ("gte", toQueryParam v)
         FilterLTE v -> ("lte", toQueryParam v)
 

servant-util/src/Servant/Util/Combinators/Filtering/Filters/Like.hs

@@ -12,7 +12,7 @@ import Universum
 import qualified Data.Map as M
 import qualified Data.Text.Lazy as LT
 import Fmt (Buildable (..), (+|), (|+))
-import Servant (ToHttpApiData (..), FromHttpApiData (..))
+import Servant (FromHttpApiData (..), ToHttpApiData (..))
 import System.Console.Pretty (Color (..), Style (..), color, style)
 
 import Servant.Util.Combinators.Filtering.Base

servant-util/src/Servant/Util/Combinators/Filtering/Logging.hs

@@ -8,10 +8,9 @@ import Universum
 
 import qualified Data.List as L
 import Data.Typeable (cast)
-import Fmt (Buildable (..), Builder, fmt)
-import Fmt ((+|), (|+))
+import Fmt (Buildable (..), Builder, fmt, (+|), (|+))
 import GHC.TypeLits (KnownSymbol)
-import Servant ((:>), HasServer (..))
+import Servant (HasServer (..), (:>))
 
 import Servant.Util.Combinators.Filtering.Base
 import Servant.Util.Combinators.Filtering.Server

servant-util/src/Servant/Util/Combinators/Filtering/Server.hs

@@ -13,7 +13,7 @@ import Fmt (Buildable (..))
 import GHC.TypeLits (KnownSymbol)
 import Network.HTTP.Types.URI (QueryText, parseQueryText)
 import Network.Wai.Internal (rawQueryString)
-import Servant ((:>), FromHttpApiData (..), HasServer (..), ServerError (..), err400)
+import Servant (FromHttpApiData (..), HasServer (..), ServerError (..), err400, (:>))
 import Servant.Server.Internal (addParameterCheck, delayedFailFatal, withRequest)
 
 import Servant.Util.Combinators.Filtering.Base

servant-util/src/Servant/Util/Combinators/Logging.hs

@@ -27,8 +27,8 @@ import Data.Time.Clock.POSIX (getPOSIXTime)
 import Fmt (Buildable (..), Builder, blockListF, pretty, (+|), (|+), (||+))
 import GHC.IO.Unsafe (unsafePerformIO)
 import GHC.TypeLits (KnownSymbol, symbolVal)
-import Servant.API ((:<|>) (..), (:>), Capture, Description, NoContent, QueryFlag, QueryParam', Raw,
-                    ReflectMethod (..), ReqBody, SBoolI, Summary, Verb)
+import Servant.API (Capture, Description, NoContent, QueryFlag, QueryParam', Raw,
+                    ReflectMethod (..), ReqBody, SBoolI, Summary, Verb, (:<|>) (..), (:>))
 import Servant.API.Modifiers (FoldRequired, foldRequiredArgument)
 import Servant.Server (Handler (..), HasServer (..), Server, ServerError (..))
 import Servant.Swagger.UI.Core (SwaggerUiHtml)
@@ -196,7 +196,7 @@ instance ( Buildable a
     type ApiArgToLog (QueryParam' mods cs a) = a
     toLogParamInfo _ mparam = foldRequiredArgument (Proxy :: Proxy mods) (\(a :: a) -> pretty a)
       (\case
-        Just a -> pretty a
+        Just a  -> pretty a
         Nothing -> noEntry) mparam
       where
         noEntry = gray "-"

servant-util/src/Servant/Util/Combinators/Pagination.hs

@@ -13,8 +13,8 @@ import Control.Lens ((<>~), (?~))
 import Data.Default (Default (..))
 import qualified Data.Swagger as S
 import qualified Data.Text as T
-import Servant ((:>), DefaultErrorFormatters, ErrorFormatters, HasContextEntry, HasServer (..),
-                QueryParam)
+import Servant (DefaultErrorFormatters, ErrorFormatters, HasContextEntry, HasServer (..),
+                QueryParam, (:>))
 import Servant.Client (HasClient (..))
 import Servant.Swagger (HasSwagger (..))
 

servant-util/src/Servant/Util/Combinators/Sorting/Base.hs

@@ -15,7 +15,7 @@ module Servant.Util.Combinators.Sorting.Base
 import Universum
 
 import Fmt (Buildable (..))
-import Servant ((:>), QueryParam)
+import Servant (QueryParam, (:>))
 import Servant.Server (Tagged (..))
 import Servant.Util.Common
 

servant-util/src/Servant/Util/Combinators/Sorting/Client.hs

@@ -5,7 +5,7 @@ module Servant.Util.Combinators.Sorting.Client () where
 import Universum
 
 import qualified Data.Text as T
-import Servant.API ((:>), ToHttpApiData (..))
+import Servant.API (ToHttpApiData (..), (:>))
 import Servant.Client.Core (Client, HasClient (..))
 import Servant.Server (Tagged (..))
 

servant-util/src/Servant/Util/Combinators/Sorting/Server.hs

@@ -7,10 +7,10 @@ import Universum
 import Data.Char (isAlphaNum)
 import qualified Data.List as L
 import qualified Data.Set as S
-import Servant.API ((:>), FromHttpApiData (..))
+import Servant.API (FromHttpApiData (..), (:>))
 import Servant.Server (DefaultErrorFormatters, ErrorFormatters, HasServer (..), Tagged (..),
                        unTagged)
-import Servant.Server.Internal.Context (type (.++), HasContextEntry)
+import Servant.Server.Internal.Context (HasContextEntry, type (.++))
 import Text.Megaparsec ((<?>))
 import qualified Text.Megaparsec as P
 import qualified Text.Megaparsec.Char as P

servant-util/src/Servant/Util/Combinators/Tag.hs

@@ -10,7 +10,7 @@ import Control.Lens (at, (?~))
 import qualified Data.HashSet.InsOrd as HS
 import qualified Data.Swagger as S
 import GHC.TypeLits (ErrorMessage (..), KnownSymbol, Symbol, TypeError)
-import Servant ((:<|>), (:>), HasServer (..), StdMethod, Verb)
+import Servant (HasServer (..), StdMethod, Verb, (:<|>), (:>))
 import Servant.Client (HasClient (..))
 import Servant.Swagger (HasSwagger (..))
 

servant-util/src/Servant/Util/Common/Common.hs

@@ -15,7 +15,7 @@ import Universum
 import qualified Data.Text.Buildable as B
 import Fmt (pretty)
 import GHC.TypeLits (KnownSymbol, Symbol, symbolVal)
-import Servant.API ((:>), Capture, QueryFlag, QueryParam', ReqBody)
+import Servant.API (Capture, QueryFlag, QueryParam', ReqBody, (:>))
 import Servant.API.Modifiers (RequiredArgument)
 import Servant.Server (Handler (..), HasServer (..), Server)
 import qualified Servant.Server.Internal as SI

servant-util/src/Servant/Util/Dummy/Filtering.hs

@@ -50,14 +50,14 @@ instance FilterBackend DummyFilteringBackend where
 
 instance Eq a => AutoFilterSupport DummyFilteringBackend FilterMatching a where
     autoFilterSupport = \case
-        FilterMatching v -> (== v)
+        FilterMatching v    -> (== v)
         FilterNotMatching v -> (/= v)
-        FilterItemsIn vs -> (`elem` vs)
+        FilterItemsIn vs    -> (`elem` vs)
 
 instance Ord a => AutoFilterSupport DummyFilteringBackend FilterComparing a where
     autoFilterSupport = \case
-        FilterGT v -> (> v)
-        FilterLT v -> (< v)
+        FilterGT v  -> (> v)
+        FilterLT v  -> (< v)
         FilterGTE v -> (>= v)
         FilterLTE v -> (<= v)
 

servant-util/src/Servant/Util/Stats.hs

@@ -7,7 +7,7 @@ import Universum
 
 import GHC.TypeLits (ErrorMessage (..), Symbol, TypeError)
 import Network.HTTP.Types.Method (Method, StdMethod)
-import Servant ((:<|>), (:>), EmptyAPI, Raw, ReflectMethod (..), Verb)
+import Servant (EmptyAPI, Raw, ReflectMethod (..), Verb, (:<|>), (:>))
 
 -------------------------------------------------------------------------
 -- CORS methods coherence

servant-util/src/Servant/Util/Swagger.hs

@@ -11,11 +11,11 @@ module Servant.Util.Swagger
 import Universum
 
 import Control.Exception (assert)
-import Control.Lens (ix, makePrisms, zoom, (?=), _head)
+import Control.Lens (_head, ix, makePrisms, zoom, (?=))
 import qualified Data.Swagger as S
 import GHC.TypeLits (KnownSymbol, Symbol)
-import Servant ((:<|>), (:>), Capture', Description, EmptyAPI, NoContent, QueryFlag, QueryParam',
-                Raw, StdMethod, Verb)
+import Servant (Capture', Description, EmptyAPI, NoContent, QueryFlag, QueryParam', Raw, StdMethod,
+                Verb, (:<|>), (:>))
 import Servant.Swagger (HasSwagger (..))
 
 import Servant.Util.Common