master..b090417 · typeable/http-api-data

git.iko.soy/typeable/http-api-data

on b090417 help sign in

.github/workflows/haskell-ci.yml+43−120

since splitsnapshots

unifiedsplit

@@ -8,9 +8,9 @@

9# For more information, see https://github.com/haskell-CI/haskell-ci

10#

11−# version: 0.15.20220609

11+# version: 0.11.20210220

12#

13−# REGENDATA ("0.15.20220609",["github","cabal.project"])

13+# REGENDATA ("0.11.20210220",["github","cabal.project"])

14#

15name: Haskell-CI

16on:

@@ -22,119 +22,63 @@ on:

22 - master

23jobs:

24 linux:

25− name: Haskell-CI - Linux - ${{ matrix.compiler }}

25+ name: Haskell-CI - Linux - GHC ${{ matrix.ghc }}

26− runs-on: ubuntu-20.04

26+ runs-on: ubuntu-18.04

27− timeout-minutes:

28− 60

29 container:

27 container:

30 image: buildpack-deps:bionic

28 image: buildpack-deps:bionic

31 continue-on-error: ${{ matrix.allow-failure }}

29 continue-on-error: ${{ matrix.allow-failure }}

32 strategy:

30 strategy:

33 matrix:

31 matrix:

34 include:

32 include:

35− - compiler: ghc-9.4.0.20220523

33+ - ghc: 9.0.1

36− compilerKind: ghc

37− compilerVersion: 9.4.0.20220523

38− setup-method: ghcup

39− allow-failure: true

40− - compiler: ghc-9.2.3

41− compilerKind: ghc

42− compilerVersion: 9.2.3

43− setup-method: ghcup

44 allow-failure: false

34 allow-failure: false

45− - compiler: ghc-9.0.2

35+ - ghc: 8.10.4

46− compilerKind: ghc

47− compilerVersion: 9.0.2

48− setup-method: ghcup

49 allow-failure: false

36 allow-failure: false

50− - compiler: ghc-8.10.7

37+ - ghc: 8.8.4

51− compilerKind: ghc

52− compilerVersion: 8.10.7

53− setup-method: ghcup

54 allow-failure: false

38 allow-failure: false

55− - compiler: ghc-8.8.4

39+ - ghc: 8.6.5

56− compilerKind: ghc

57− compilerVersion: 8.8.4

58− setup-method: hvr-ppa

59 allow-failure: false

40 allow-failure: false

60− - compiler: ghc-8.6.5

41+ - ghc: 8.4.4

61− compilerKind: ghc

62− compilerVersion: 8.6.5

63− setup-method: hvr-ppa

64 allow-failure: false

42 allow-failure: false

65− - compiler: ghc-8.4.4

43+ - ghc: 8.2.2

66− compilerKind: ghc

67− compilerVersion: 8.4.4

68− setup-method: hvr-ppa

69 allow-failure: false

44 allow-failure: false

70− - compiler: ghc-8.2.2

45+ - ghc: 8.0.2

71− compilerKind: ghc

72− compilerVersion: 8.2.2

73− setup-method: hvr-ppa

74 allow-failure: false

46 allow-failure: false

75− - compiler: ghc-8.0.2

47+ - ghc: 7.10.3

76− compilerKind: ghc

48+ allow-failure: false

77− compilerVersion: 8.0.2

49+ - ghc: 7.8.4

78− setup-method: hvr-ppa

79 allow-failure: false

50 allow-failure: false

80 fail-fast: false

51 fail-fast: false

81 steps:

52 steps:

82 - name: apt

53 - name: apt

83 run: |

54 run: |

84 apt-get update

55 apt-get update

85− apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5

56+ apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common

86− if [ "${{ matrix.setup-method }}" = ghcup ]; then

87− mkdir -p "$HOME/.ghcup/bin"

88− curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"

89− chmod a+x "$HOME/.ghcup/bin/ghcup"

90− if $HEADHACKAGE; then "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; fi

91− "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

92− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

93− else

94− apt-add-repository -y 'ppa:hvr/ghc'

57+ apt-add-repository -y 'ppa:hvr/ghc'

95− apt-get update

58+ apt-get update

96− apt-get install -y "$HCNAME"

59+ apt-get install -y ghc-$GHC_VERSION cabal-install-3.4

97− mkdir -p "$HOME/.ghcup/bin"

98− curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"

99− chmod a+x "$HOME/.ghcup/bin/ghcup"

100− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

101− fi

102 env:

60 env:

103− HCKIND: ${{ matrix.compilerKind }}

61+ GHC_VERSION: ${{ matrix.ghc }}

104− HCNAME: ${{ matrix.compiler }}

105− HCVER: ${{ matrix.compilerVersion }}

106 - name: Set PATH and environment variables

62 - name: Set PATH and environment variables

107 run: |

63 run: |

108 echo "$HOME/.cabal/bin" >> $GITHUB_PATH

64 echo "$HOME/.cabal/bin" >> $GITHUB_PATH

109− echo "LANG=C.UTF-8" >> "$GITHUB_ENV"

65+ echo "LANG=C.UTF-8" >> $GITHUB_ENV

110− echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

66+ echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV

111− echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

67+ echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV

112− HCDIR=/opt/$HCKIND/$HCVER

68+ HC=/opt/ghc/$GHC_VERSION/bin/ghc

113− if [ "${{ matrix.setup-method }}" = ghcup ]; then

114− HC=$HOME/.ghcup/bin/$HCKIND-$HCVER

115− echo "HC=$HC" >> "$GITHUB_ENV"

69+ echo "HC=$HC" >> $GITHUB_ENV

116− echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"

70+ echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV

117− echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"

118− echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

119− else

120− HC=$HCDIR/bin/$HCKIND

121− echo "HC=$HC" >> "$GITHUB_ENV"

122− echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"

123− echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"

71+ echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV

124− echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

72+ echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV

125− fi

126−

127 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

73 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

128− echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

74+ echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV

129− echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

75+ echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

130− echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"

76+ echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV

131− if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi

77+ echo "HEADHACKAGE=false" >> $GITHUB_ENV

132− echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"

78+ echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV

133− echo "GHCJSARITH=0" >> "$GITHUB_ENV"

79+ echo "GHCJSARITH=0" >> $GITHUB_ENV

134 env:

80 env:

135− HCKIND: ${{ matrix.compilerKind }}

81+ GHC_VERSION: ${{ matrix.ghc }}

136− HCNAME: ${{ matrix.compiler }}

137− HCVER: ${{ matrix.compilerVersion }}

138 - name: env

82 - name: env

139 run: |

83 run: |

140 env

84 env

@@ -157,22 +101,6 @@ jobs:

157 repository hackage.haskell.org

101 repository hackage.haskell.org

158 url: http://hackage.haskell.org/

102 url: http://hackage.haskell.org/

159 EOF

103 EOF

160− if $HEADHACKAGE; then

161− cat >> $CABAL_CONFIG <<EOF

162− repository head.hackage.ghc.haskell.org

163− url: https://ghc.gitlab.haskell.org/head.hackage/

164− secure: True

165− root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d

166− 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329

167− f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89

168− key-threshold: 3

169− active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override

170− EOF

171− fi

172− cat >> $CABAL_CONFIG <<EOF

173− program-default-options

174− ghc-options: $GHCJOBS +RTS -M3G -RTS

175− EOF

176 cat $CABAL_CONFIG

104 cat $CABAL_CONFIG

177 - name: versions

105 - name: versions

178 run: |

106 run: |

@@ -185,7 +113,7 @@ jobs:

185 - name: cache (tools)

113 - name: cache (tools)

186 uses: actions/cache@v2

114 uses: actions/cache@v2

187 with:

115 with:

188− key: ${{ runner.os }}-${{ matrix.compiler }}-tools-445c2459

116+ key: ${{ runner.os }}-${{ matrix.ghc }}-tools-0d2d184d

189 path: ~/.haskell-ci-tools

117 path: ~/.haskell-ci-tools

190 - name: install cabal-plan

118 - name: install cabal-plan

191 run: |

119 run: |

@@ -198,8 +126,8 @@ jobs:

198 cabal-plan --version

126 cabal-plan --version

199 - name: install doctest

127 - name: install doctest

200 run: |

128 run: |

201− if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi

129+ if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi

202− if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi

130+ if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi

203 - name: checkout

131 - name: checkout

204 uses: actions/checkout@v2

132 uses: actions/checkout@v2

205 with:

133 with:

@@ -220,8 +148,7 @@ jobs:

220 - name: generate cabal.project

148 - name: generate cabal.project

221 run: |

149 run: |

222 PKGDIR_http_api_data="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/http-api-data-[0-9.]*')"

150 PKGDIR_http_api_data="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/http-api-data-[0-9.]*')"

223− echo "PKGDIR_http_api_data=${PKGDIR_http_api_data}" >> "$GITHUB_ENV"

151+ echo "PKGDIR_http_api_data=${PKGDIR_http_api_data}" >> $GITHUB_ENV

224− rm -f cabal.project cabal.project.local

225 touch cabal.project

152 touch cabal.project

226 touch cabal.project.local

153 touch cabal.project.local

227 echo "packages: ${PKGDIR_http_api_data}" >> cabal.project

154 echo "packages: ${PKGDIR_http_api_data}" >> cabal.project

@@ -229,9 +156,6 @@ jobs:

229 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi

156 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi

230 cat >> cabal.project <<EOF

157 cat >> cabal.project <<EOF

231 EOF

158 EOF

232− if $HEADHACKAGE; then

233− echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project

234− fi

235 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(http-api-data)$/; }' >> cabal.project.local

159 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(http-api-data)$/; }' >> cabal.project.local

236 cat cabal.project

160 cat cabal.project

237 cat cabal.project.local

161 cat cabal.project.local

@@ -242,9 +166,9 @@ jobs:

242 - name: cache

166 - name: cache

243 uses: actions/cache@v2

167 uses: actions/cache@v2

244 with:

168 with:

245− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

169+ key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}

246 path: ~/.cabal/store

170 path: ~/.cabal/store

247− restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-

171+ restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-

248 - name: install dependencies

172 - name: install dependencies

249 run: |

173 run: |

250 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all

174 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all

@@ -261,15 +185,15 @@ jobs:

261 - name: doctest

185 - name: doctest

262 run: |

186 run: |

263 perl -i -e 'while (<ARGV>) { print unless /package-id\s+(base-compat)-\d+(\.\d+)*/; }' .ghc.environment.*

187 perl -i -e 'while (<ARGV>) { print unless /package-id\s+(base-compat)-\d+(\.\d+)*/; }' .ghc.environment.*

264− if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_http_api_data} || false ; fi

188+ if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_http_api_data} || false ; fi

265− if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src/ ; fi

189+ if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src/ ; fi

266 - name: cabal check

190 - name: cabal check

267 run: |

191 run: |

268 cd ${PKGDIR_http_api_data} || false

192 cd ${PKGDIR_http_api_data} || false

269 ${CABAL} -vnormal check

193 ${CABAL} -vnormal check

270 - name: haddock

194 - name: haddock

271 run: |

195 run: |

272− $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

196+ $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

273 - name: unconstrained build

197 - name: unconstrained build

274 run: |

198 run: |

275 rm -f cabal.project.local

199 rm -f cabal.project.local

@@ -279,5 +203,4 @@ jobs:

279 rm -f cabal.project.local

203 rm -f cabal.project.local

280 - name: constraint set text-show

204 - name: constraint set text-show

281 run: |

205 run: |

282− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' --dependencies-only -j2 all

283 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all

206 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all

CHANGELOG.md−7

@@ -1,10 +1,3 @@

1−0.5

2−---

3−

4−* Use `attoparsec-iso8601-1.1.0.0`.

5− `Day` and `UTCTime` parsers require at least 4 digits now, which is a breaking change.

6−* Drop GHC-7.8 and GHC-7.10 support.

7−

80.4.3

10.4.3

9-----

2-----

http-api-data.cabal+28−15

@@ -1,6 +1,7 @@

1cabal-version: >= 1.10

2name: http-api-data

3−version: 0.5

3+version: 0.4.3

4+x-revision: 2

5synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.

6synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.

6category: Web

7category: Web

@@ -24,15 +25,15 @@ extra-source-files:

24 README.md

25 README.md

26tested-with:

27tested-with:

28+ GHC==7.8.4,

29+ GHC==7.10.3,

27 GHC==8.0.2,

30 GHC==8.0.2,

28 GHC==8.2.2,

31 GHC==8.2.2,

29 GHC==8.4.4,

32 GHC==8.4.4,

30 GHC==8.6.5,

33 GHC==8.6.5,

31 GHC==8.8.4,

34 GHC==8.8.4,

32− GHC==8.10.7,

35+ GHC==8.10.4,

33− GHC==9.0.2,

36+ GHC==9.0.1

34− GHC==9.2.3,

35− GHC==9.4.1

37flag use-text-show

38flag use-text-show

38 description: Use text-show library for efficient ToHttpApiData implementations.

39 description: Use text-show library for efficient ToHttpApiData implementations.

@@ -44,25 +45,37 @@ library

44 include-dirs: include/

45 include-dirs: include/

46 -- GHC bundled

47 -- GHC bundled

47− build-depends: base >= 4.9 && < 4.17

48+ build-depends: base >= 4.7 && < 4.16

48− , bytestring >= 0.10.8.1 && < 0.12

49+ , bytestring >= 0.10.4.0 && < 0.12

49− , containers >= 0.5.7.1 && < 0.7

50+ , containers >= 0.5.5.1 && < 0.7

50− , text >= 1.2.3.0 && < 1.3 || >=2.0 && <2.1

51+ , text >= 1.2.3.0 && < 1.3

51− , transformers >= 0.5.2.0 && < 0.7

52+ , transformers >= 0.3 && < 0.6

53+

54+ -- so Semigroup Builder exists

55+ if impl(ghc >= 8.0)

56+ build-depends: bytestring >= 0.10.8.1

53 -- other-dependencies

58 -- other-dependencies

54 build-depends:

59 build-depends:

55 attoparsec >= 0.13.2.2 && < 0.15

60 attoparsec >= 0.13.2.2 && < 0.15

56− , attoparsec-iso8601 >= 1.1.0.0 && < 1.2

61+ , attoparsec-iso8601 >= 1.0.2.0 && < 1.1

57− , base-compat >= 0.10.5 && < 0.13

62+ , base-compat >= 0.10.5 && < 0.12

58 , cookie >= 0.4.3 && < 0.5

63 , cookie >= 0.4.3 && < 0.5

59− , hashable >= 1.2.7.0 && < 1.5

64+ , hashable >= 1.2.7.0 && < 1.4

60 , http-types >= 0.12.3 && < 0.13

65 , http-types >= 0.12.3 && < 0.13

61 , tagged >= 0.8.5 && < 0.9

66 , tagged >= 0.8.5 && < 0.9

62 , time-compat >= 1.9.5 && < 1.10

67 , time-compat >= 1.9.5 && < 1.10

63 , unordered-containers >= 0.2.10.0 && < 0.3

68 , unordered-containers >= 0.2.10.0 && < 0.3

64 , uuid-types >= 1.0.3 && < 1.1

69 , uuid-types >= 1.0.3 && < 1.1

71+ if !impl(ghc >= 7.10)

72+ build-depends:

73+ nats >= 1.1.2 && < 1.2,

74+ void >= 0.7.3 && < 0.8

75+

76+ if !impl(ghc >= 8.0)

77+ build-depends: semigroups >= 0.18.5 && < 0.20

78+

66 if flag(use-text-show)

79 if flag(use-text-show)

67 cpp-options: -DUSE_TEXT_SHOW

80 cpp-options: -DUSE_TEXT_SHOW

68 build-depends: text-show >= 3.8.2 && <3.10

81 build-depends: text-show >= 3.8.2 && <3.10

@@ -85,7 +98,7 @@ test-suite spec

85 hs-source-dirs: test

98 hs-source-dirs: test

86 ghc-options: -Wall

99 ghc-options: -Wall

87 default-language: Haskell2010

100 default-language: Haskell2010

88− build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.11

101+ build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.8

89 -- inherited depndencies

102 -- inherited depndencies

90 build-depends:

103 build-depends:

91 base

104 base

@@ -102,7 +115,7 @@ test-suite spec

102 build-depends: nats

115 build-depends: nats

103

116

104 build-depends: HUnit >= 1.6.0.0 && <1.7

117 build-depends: HUnit >= 1.6.0.0 && <1.7

105− , hspec >= 2.7.1 && <2.11

118+ , hspec >= 2.7.1 && <2.8

106 , QuickCheck >= 2.13.1 && <2.15

119 , QuickCheck >= 2.13.1 && <2.15

107 , quickcheck-instances >= 0.3.25.2 && <0.4

120 , quickcheck-instances >= 0.3.25.2 && <0.4

108

121

src/Web/Internal/HttpApiData.hs+10−3

@@ -32,7 +32,6 @@ import Data.Data (Data)

32import qualified Data.Fixed as F

33import Data.Functor.Identity (Identity(Identity))

34import Data.Int (Int16, Int32, Int64, Int8)

35−import Data.Kind (Type)

36import qualified Data.Map as Map

35import qualified Data.Map as Map

37import Data.Monoid (All (..), Any (..), Dual (..),

36import Data.Monoid (All (..), Any (..), Dual (..),

38 First (..), Last (..),

37 First (..), Last (..),

@@ -72,6 +71,12 @@ import Text.Read (readMaybe)

72import Web.Cookie (SetCookie, parseSetCookie,

71import Web.Cookie (SetCookie, parseSetCookie,

73 renderSetCookie)

72 renderSetCookie)

74+#if MIN_VERSION_base(4,9,0)

75+import Data.Kind (Type)

76+#else

77+#define Type *

78+#endif

79+

75#if USE_TEXT_SHOW

80#if USE_TEXT_SHOW

76import TextShow (TextShow, showt)

81import TextShow (TextShow, showt)

77#endif

82#endif

@@ -96,7 +101,7 @@ class ToHttpApiData a where

96 -- The default definition uses 'H.encodePathSegmentsRelative',

101 -- The default definition uses 'H.encodePathSegmentsRelative',

97 -- but this may be overriden with a more efficient version.

102 -- but this may be overriden with a more efficient version.

98 toEncodedUrlPiece :: a -> BS.Builder

103 toEncodedUrlPiece :: a -> BS.Builder

99− toEncodedUrlPiece = H.urlEncodeBuilder True . encodeUtf8 . toUrlPiece

104+ toEncodedUrlPiece = H.encodePathSegmentsRelative . (:[]) . toUrlPiece

100

105

101 -- | Convert to HTTP header value.

106 -- | Convert to HTTP header value.

102 toHeader :: a -> ByteString

107 toHeader :: a -> ByteString

@@ -514,7 +519,7 @@ instance ToHttpApiData DayOfWeek where

514

519

515 toEncodedUrlPiece = unsafeToEncodedUrlPiece

520 toEncodedUrlPiece = unsafeToEncodedUrlPiece

516

521

517−-- |

522+-- |

518-- >>> toUrlPiece Q4

523-- >>> toUrlPiece Q4

519-- "q4"

524-- "q4"

520instance ToHttpApiData QuarterOfYear where

525instance ToHttpApiData QuarterOfYear where

@@ -865,3 +870,5 @@ runAtto :: Atto.Parser a -> Text -> Either Text a

865runAtto p t = case Atto.parseOnly (p <* Atto.endOfInput) t of

870runAtto p t = case Atto.parseOnly (p <* Atto.endOfInput) t of

866 Left err -> Left (T.pack err)

871 Left err -> Left (T.pack err)

867 Right x -> Right x

872 Right x -> Right x

873+

874+