Update to protolude 0.3.0

The good part is that protolude 0.3.0 builds with GHC 8.10.

The bad part is that this change is a bit painful:
- the default `toS` has changed to no longer convert to and from ByteString
- similarly, `show` no longer outputs ByteString

The changes here are pretty much minimal to keep things compiling; I didn't
see a nice way to work with the new ConvertText class, even though `toUtf8`
seems like it might help if used besides `toS` at just the right spots.
This commit is contained in:
Robert Vollmert
2020-04-23 14:14:21 -05:00
committed by Steve Chavez
parent 2e6a094d48
commit 3da5a2875e
20 changed files with 52 additions and 30 deletions
+3 -2
View File
@@ -27,7 +27,8 @@ import Network.Wai (Response, responseLBS)
import Network.HTTP.Types.Header
import PostgREST.Types
import Protolude
import Protolude hiding (toS)
import Protolude.Conv (toS)
class (JSON.ToJSON a) => PgrstError a where
@@ -279,7 +280,7 @@ instance JSON.ToJSON SimpleError where
invalidTokenHeader :: Text -> Header
invalidTokenHeader m =
("WWW-Authenticate", "Bearer error=\"invalid_token\", " <> "error_description=" <> show m)
("WWW-Authenticate", "Bearer error=\"invalid_token\", " <> "error_description=" <> encodeUtf8 (show m))
singularityError :: (Integral a) => a -> SimpleError
singularityError = SingularityError . toInteger