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
+4 -3
View File
@@ -26,7 +26,8 @@ import Data.Ranged.Ranges
import Network.HTTP.Types.Header
import Network.HTTP.Types.Status
import Protolude
import Protolude hiding (toS)
import Protolude.Conv (toS)
type NonnegRange = Range Integer
@@ -91,9 +92,9 @@ rangeStatusHeader topLevelRange queryTotal tableTotal =
contentRangeH :: (Integral a, Show a) => a -> a -> Maybe a -> Header
contentRangeH lower upper total =
("Content-Range", headerValue)
("Content-Range", toUtf8 headerValue)
where
headerValue = rangeString <> "/" <> totalString
headerValue = rangeString <> "/" <> totalString :: Text
rangeString
| totalNotZero && fromInRange = show lower <> "-" <> show upper
| otherwise = "*"