From 71cb8afc0defc5129df7792548f3dbd56039d9c0 Mon Sep 17 00:00:00 2001 From: monacoremo <59358383+monacoremo@users.noreply.github.com> Date: Sun, 7 Nov 2021 16:17:24 +0100 Subject: [PATCH] refactor: Remove Protolude.Conv from JSPath --- src/PostgREST/Config/JSPath.hs | 3 +-- src/PostgREST/Request/ApiRequest.hs | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/PostgREST/Config/JSPath.hs b/src/PostgREST/Config/JSPath.hs index 3fbddae7f..97405654f 100644 --- a/src/PostgREST/Config/JSPath.hs +++ b/src/PostgREST/Config/JSPath.hs @@ -11,8 +11,7 @@ import Data.Either.Combinators (mapLeft) import Text.ParserCombinators.Parsec (()) import Text.Read (read) -import Protolude hiding (toS) -import Protolude.Conv (toS) +import Protolude -- | full jspath, e.g. .property[0].attr.detail diff --git a/src/PostgREST/Request/ApiRequest.hs b/src/PostgREST/Request/ApiRequest.hs index 223547e56..39fa9478b 100644 --- a/src/PostgREST/Request/ApiRequest.hs +++ b/src/PostgREST/Request/ApiRequest.hs @@ -16,18 +16,18 @@ module PostgREST.Request.ApiRequest , userApiRequest ) where -import qualified Data.Aeson as JSON -import qualified Data.ByteString.Char8 as BS -import qualified Data.ByteString.Lazy as LBS -import qualified Data.CaseInsensitive as CI -import qualified Data.Csv as CSV -import qualified Data.HashMap.Strict as M -import qualified Data.List as L -import qualified Data.Set as S -import qualified Data.Text as T -import qualified Data.Text.Encoding as T -import qualified Data.Vector as V -import qualified Data.List.NonEmpty as NonEmptyList +import qualified Data.Aeson as JSON +import qualified Data.ByteString.Char8 as BS +import qualified Data.ByteString.Lazy as LBS +import qualified Data.CaseInsensitive as CI +import qualified Data.Csv as CSV +import qualified Data.HashMap.Strict as M +import qualified Data.List as L +import qualified Data.List.NonEmpty as NonEmptyList +import qualified Data.Set as S +import qualified Data.Text as T +import qualified Data.Text.Encoding as T +import qualified Data.Vector as V import Control.Arrow ((***)) import Data.Aeson.Types (emptyArray, emptyObject)