diff --git a/main/Main.hs b/main/Main.hs index ab201d08f..54410264e 100644 --- a/main/Main.hs +++ b/main/Main.hs @@ -17,8 +17,7 @@ import Data.IORef (IORef, atomicWriteIORef, newIORef, readIORef) import Data.String (IsString (..)) import Data.Text (pack, replace, strip, stripPrefix) -import Data.Text.Encoding (decodeUtf8, encodeUtf8) -import Data.Text.IO (hPutStrLn, readFile) +import Data.Text.IO (hPutStrLn) import Data.Time.Clock (getCurrentTime) import Network.Wai.Handler.Warp (defaultSettings, runSettings, setHost, setPort, setServerName) diff --git a/postgrest.cabal b/postgrest.cabal index e60b0d36d..c46bb64db 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -72,7 +72,7 @@ library , network-uri >= 2.6.1 && < 2.7 , optparse-applicative >= 0.13 && < 0.16 , parsec >= 3.1.11 && < 3.2 - , protolude >= 0.2.2 && < 0.3 + , protolude >= 0.2.4 && < 0.3 , regex-tdfa >= 1.2.2 && < 1.4 , scientific >= 0.3.4 && < 0.4 , swagger2 >= 2.4 && < 2.6 @@ -103,7 +103,7 @@ executable postgrest , hasql-transaction >= 0.7.2 && < 1.1 , network < 3.2 , postgrest - , protolude >= 0.2.2 && < 0.3 + , protolude >= 0.2.4 && < 0.3 , retry >= 0.7.4 && < 0.9 , text >= 1.2.2 && < 1.3 , time >= 1.6 && < 1.10 @@ -178,7 +178,7 @@ test-suite spec , monad-control >= 1.0.1 && < 1.1 , postgrest , process >= 1.4.2 && < 1.7 - , protolude >= 0.2.2 && < 0.3 + , protolude >= 0.2.4 && < 0.3 , regex-tdfa >= 1.2.2 && < 1.4 , text >= 1.2.2 && < 1.3 , time >= 1.6 && < 1.10 @@ -222,7 +222,7 @@ Test-Suite spec-querycost , monad-control >= 1.0.1 && < 1.1 , postgrest , process >= 1.4.2 && < 1.7 - , protolude >= 0.2.2 && < 0.3 + , protolude >= 0.2.4 && < 0.3 , regex-tdfa >= 1.2.2 && < 1.4 , text >= 1.2.2 && < 1.3 , time >= 1.6 && < 1.10 diff --git a/src/PostgREST/ApiRequest.hs b/src/PostgREST/ApiRequest.hs index cf095bb38..324ba42a5 100644 --- a/src/PostgREST/ApiRequest.hs +++ b/src/PostgREST/ApiRequest.hs @@ -28,8 +28,8 @@ import qualified Data.Vector as V import Control.Arrow ((***)) import Data.Aeson.Types (emptyArray, emptyObject) -import Data.List (elem, last, lookup, partition) -import Data.List.NonEmpty (NonEmpty, head) +import Data.List (last, lookup, partition) +import Data.List.NonEmpty (head) import Data.Maybe (fromJust) import Data.Ranged.Ranges (Range (..), emptyRange, rangeIntersection) diff --git a/src/PostgREST/App.hs b/src/PostgREST/App.hs index a9b59c40a..88a2feef6 100644 --- a/src/PostgREST/App.hs +++ b/src/PostgREST/App.hs @@ -40,7 +40,6 @@ import Network.HTTP.Types.Status import Network.Wai import PostgREST.ApiRequest (Action (..), ApiRequest (..), - ContentType (..), InvokeMethod (..), Target (..), mutuallyAgreeable, userApiRequest) import PostgREST.Auth (containsRole, jwtClaims, diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs index 5b6993ae4..cfaec4e55 100644 --- a/src/PostgREST/Config.hs +++ b/src/PostgREST/Config.hs @@ -37,12 +37,11 @@ import Control.Lens (preview) import Control.Monad (fail) import Crypto.JWT (StringOrURI, stringOrUri) import Data.List (lookup) -import Data.List.NonEmpty (NonEmpty, fromList) +import Data.List.NonEmpty (fromList) import Data.Scientific (floatingOrInteger) import Data.Text (dropEnd, dropWhileEnd, - intercalate, lines, splitOn, - strip, take, unpack) -import Data.Text.Encoding (encodeUtf8) + intercalate, splitOn, strip, take, + unpack) import Data.Text.IO (hPutStrLn) import Data.Version (versionBranch) import Development.GitRev (gitHash) diff --git a/src/PostgREST/Error.hs b/src/PostgREST/Error.hs index 1e0b8e42d..9766b1924 100644 --- a/src/PostgREST/Error.hs +++ b/src/PostgREST/Error.hs @@ -23,7 +23,6 @@ import qualified Network.HTTP.Types.Status as HT import Data.Aeson ((.=)) import Network.Wai (Response, responseLBS) -import Text.Read (readMaybe) import Network.HTTP.Types.Header diff --git a/src/PostgREST/Parsers.hs b/src/PostgREST/Parsers.hs index 7962636ab..98239f8e5 100644 --- a/src/PostgREST/Parsers.hs +++ b/src/PostgREST/Parsers.hs @@ -9,10 +9,8 @@ module PostgREST.Parsers where import qualified Data.HashMap.Strict as M import qualified Data.Set as S -import Control.Monad ((>>)) import Data.Either.Combinators (mapLeft) import Data.Foldable (foldl1) -import Data.Functor (($>)) import Data.List (init, last) import Data.Text (intercalate, replace, strip) import Text.Read (read) diff --git a/src/PostgREST/Private/QueryFragment.hs b/src/PostgREST/Private/QueryFragment.hs index 03324a7ad..cbd5a868e 100644 --- a/src/PostgREST/Private/QueryFragment.hs +++ b/src/PostgREST/Private/QueryFragment.hs @@ -11,7 +11,7 @@ import qualified Data.HashMap.Strict as HM import Data.Maybe import Data.Text (intercalate, isInfixOf, replace, - toLower, unwords) + toLower) import qualified Data.Text as T (map, null, takeWhile) import PostgREST.Types diff --git a/src/PostgREST/QueryBuilder.hs b/src/PostgREST/QueryBuilder.hs index 594780366..635e4b345 100644 --- a/src/PostgREST/QueryBuilder.hs +++ b/src/PostgREST/QueryBuilder.hs @@ -22,7 +22,7 @@ module PostgREST.QueryBuilder ( import qualified Data.Set as S -import Data.Text (intercalate, unwords) +import Data.Text (intercalate) import Data.Tree (Tree (..)) import Data.Maybe diff --git a/src/PostgREST/Statements.hs b/src/PostgREST/Statements.hs index 9a9de8958..b169f537d 100644 --- a/src/PostgREST/Statements.hs +++ b/src/PostgREST/Statements.hs @@ -22,8 +22,6 @@ import Data.Aeson as JSON import qualified Data.Aeson.Lens as L import qualified Data.ByteString.Char8 as BS import Data.Maybe -import Data.Text (unwords) -import Data.Text.Encoding (encodeUtf8) import qualified Hasql.Decoders as HD import qualified Hasql.Encoders as HE import qualified Hasql.Statement as H diff --git a/stack.yaml b/stack.yaml index 973047328..bb737fcc7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -18,3 +18,4 @@ extra-deps: - configurator-pg-0.2.0@sha256:08dcfadbe31e9e505d0bed1ab034105e1735141499734ad52d1c5ac980cde4a6,2939 - hspec-wai-0.10.1@sha256:56dd9ec1d56f47ef1946f71f7cbf070e4c285f718cac1b158400ae5e7172ef47,2290 - hspec-wai-json-0.10.1@sha256:67b405c38f0a9e2771480c8d3ecd8aeb8d8776a35d3b2906cb1b76c9538617e4,1629 + - protolude-0.2.4@sha256:8bcf18da79be0832fccdd4cd5770e20baa4caec61c141d7119632a830b4096a9,2191 diff --git a/stack.yaml.lock b/stack.yaml.lock index 38db86dfb..88b03a10b 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -39,6 +39,13 @@ packages: sha256: fb9e89b79cde3276baa484c860c6b9eeebdbc1a5c43301293351a25bc4c08e87 original: hackage: hspec-wai-json-0.10.1@sha256:67b405c38f0a9e2771480c8d3ecd8aeb8d8776a35d3b2906cb1b76c9538617e4,1629 +- completed: + hackage: protolude-0.2.4@sha256:8bcf18da79be0832fccdd4cd5770e20baa4caec61c141d7119632a830b4096a9,2191 + pantry-tree: + size: 1438 + sha256: 9d8560e5514bac03fa00a37195d683ee628169a502c263b8d94588bfeb0ba097 + original: + hackage: protolude-0.2.4@sha256:8bcf18da79be0832fccdd4cd5770e20baa4caec61c141d7119632a830b4096a9,2191 snapshots: - completed: size: 523878 diff --git a/test/Feature/ConcurrentSpec.hs b/test/Feature/ConcurrentSpec.hs index eab6d69db..d52d54666 100644 --- a/test/Feature/ConcurrentSpec.hs +++ b/test/Feature/ConcurrentSpec.hs @@ -5,7 +5,6 @@ module Feature.ConcurrentSpec where import Control.Concurrent.Async (mapConcurrently) -import Control.Monad (void) import Network.Wai (Application) import Control.Monad.Base diff --git a/test/Feature/InsertSpec.hs b/test/Feature/InsertSpec.hs index c28d4f30c..c6732a340 100644 --- a/test/Feature/InsertSpec.hs +++ b/test/Feature/InsertSpec.hs @@ -2,7 +2,6 @@ module Feature.InsertSpec where import qualified Data.Aeson as JSON -import Control.Monad (replicateM_, void) import Data.List (lookup) import Data.Maybe (fromJust) import Network.Wai (Application) diff --git a/test/Feature/UnicodeSpec.hs b/test/Feature/UnicodeSpec.hs index a3e9ce68f..b8bd2149e 100644 --- a/test/Feature/UnicodeSpec.hs +++ b/test/Feature/UnicodeSpec.hs @@ -1,7 +1,6 @@ module Feature.UnicodeSpec where -import Control.Monad (void) -import Network.Wai (Application) +import Network.Wai (Application) import Test.Hspec import Test.Hspec.Wai diff --git a/test/SpecHelper.hs b/test/SpecHelper.hs index 394a9f4c3..00eeb14bb 100644 --- a/test/SpecHelper.hs +++ b/test/SpecHelper.hs @@ -7,7 +7,6 @@ import qualified Data.Map.Strict as M import qualified Data.Set as S import qualified System.IO.Error as E -import Control.Monad (void) import Data.Aeson (Value (..), decode, encode) import Data.CaseInsensitive (CI (..)) import Data.List (lookup)