Do hlint 2.1 hints

test/Feature/AsymmetricJwtSpec.hs

@@ -8,7 +8,7 @@ import Network.HTTP.Types
 import SpecHelper
 import Network.Wai (Application)
 
-import Protolude hiding (get)
+import Protolude
 -- }}}
 
 spec :: SpecWith Application

test/Feature/BinaryJwtSecretSpec.hs

@@ -8,7 +8,7 @@ import Network.HTTP.Types
 import SpecHelper
 import Network.Wai (Application)
 
-import Protolude hiding (get)
+import Protolude
 -- }}}
 
 spec :: SpecWith Application

test/Feature/ConcurrentSpec.hs

@@ -8,7 +8,7 @@ import Control.Monad.Base
 import Control.Monad.Trans.Control
 import Control.Concurrent.Async (mapConcurrently)
 
-import Test.Hspec hiding (pendingWith)
+import Test.Hspec
 import Test.Hspec.Wai.Internal
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON

test/Feature/CorsSpec.hs

@@ -11,7 +11,7 @@ import SpecHelper
 import Network.HTTP.Types
 import Network.Wai (Application)
 
-import Protolude hiding (get)
+import Protolude
 -- }}}
 
 spec :: SpecWith Application

test/Feature/NoJwtSpec.hs

@@ -8,7 +8,7 @@ import Network.HTTP.Types
 import SpecHelper
 import Network.Wai (Application)
 
-import Protolude hiding (get)
+import Protolude
 -- }}}
 
 spec :: SpecWith Application

test/Feature/PgVersion95Spec.hs

@@ -1,6 +1,6 @@
 module Feature.PgVersion95Spec where
 
-import Test.Hspec hiding (pendingWith)
+import Test.Hspec
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 

test/Feature/PgVersion96Spec.hs

@@ -1,6 +1,6 @@
 module Feature.PgVersion96Spec where
 
-import Test.Hspec hiding (pendingWith)
+import Test.Hspec
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 

test/Feature/ProxySpec.hs

@@ -1,12 +1,12 @@
 module Feature.ProxySpec where
 
-import Test.Hspec hiding (pendingWith)
+import Test.Hspec
 
 import SpecHelper
 
 import Network.Wai (Application)
 
-import Protolude hiding (get)
+import Protolude
 
 spec :: SpecWith Application
 spec =

test/Feature/QueryLimitedSpec.hs

@@ -1,6 +1,6 @@
 module Feature.QueryLimitedSpec where
 
-import Test.Hspec hiding (pendingWith)
+import Test.Hspec
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 import Network.HTTP.Types

test/Feature/QuerySpec.hs

@@ -1,6 +1,6 @@
 module Feature.QuerySpec where
 
-import Test.Hspec hiding (pendingWith)
+import Test.Hspec
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 import Network.HTTP.Types

test/Feature/RpcSpec.hs

@@ -1,6 +1,6 @@
 module Feature.RpcSpec where
 
-import Test.Hspec hiding (pendingWith)
+import Test.Hspec
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 import Network.HTTP.Types
@@ -372,7 +372,7 @@ spec =
           [json|[{"text_search_vector":"'amus':5 'fair':7 'impossibl':9 'peu':4"},{"text_search_vector":"'art':4 'spass':5 'unmog':7"}]|]
           { matchHeaders = [matchContentTypeJson] }
 
-    it "should work with an argument of custom type in public schema" $ do
+    it "should work with an argument of custom type in public schema" $
         get "/rpc/test_arg?my_arg=something" `shouldRespondWith`
           [json|"foobar"|]
           { matchHeaders = [matchContentTypeJson] }

test/Feature/StructureSpec.hs

@@ -1,6 +1,6 @@
 module Feature.StructureSpec where
 
-import Test.Hspec hiding (pendingWith)
+import Test.Hspec
 import Test.Hspec.Wai
 import Network.HTTP.Types
 

test/SpecHelper.hs

@@ -19,7 +19,7 @@ import           Text.Heredoc
 import PostgREST.Config (AppConfig(..))
 import PostgREST.Types  (JSPathExp(..))
 
-import Test.Hspec hiding (pendingWith)
+import Test.Hspec
 import Test.Hspec.Wai
 
 import Network.HTTP.Types
@@ -61,9 +61,8 @@ validateOpenApiResponse headers = do
        D4.fetchFilesystemAndValidate schemaContext ((fromJust . decode) respBody) `shouldReturn` Right ()
 
 getEnvVarWithDefault :: Text -> Text -> IO Text
-getEnvVarWithDefault var def = do
-  varValue <- getEnv (toS var) `E.catchIOError` const (return $ toS def)
-  return $ toS varValue
+getEnvVarWithDefault var def = toS <$>
+  getEnv (toS var) `E.catchIOError` const (return $ toS def)
 
 _baseCfg :: AppConfig
 _baseCfg =  -- Connection Settings
@@ -166,5 +165,5 @@ isErrorFormat s =
     S.null (S.difference keys validKeys)
  where
   obj = decode s :: Maybe (M.Map Text Value)
-  keys = fromMaybe S.empty (M.keysSet <$> obj)
+  keys = maybe S.empty M.keysSet obj
   validKeys = S.fromList ["message", "details", "hint", "code"]