git.iko.soy/typeable/http-api-data
on 432db61 help sign in
9 files changed+223−474
since splitsnapshots
unifiedsplit
.ghci+1 .github/workflows/haskell-ci.yml−283 .travis.yml+174 CHANGELOG.md−24 cabal.haskell-ci+1−2 http-api-data.cabal+34−27 src/Web/Internal/FormUrlEncoded.hs+1−25 src/Web/Internal/HttpApiData.hs+12−107 test/Web/Internal/HttpApiDataSpec.hs−6
.ghcinew file+1
@@ -0,0 +1 @@
1+:set -itest -isrc -optP-include -optP .stack-work/dist/x86_64-osx/Cabal-1.24.0.0/build/autogen/cabal_macros.h -optP-I -optPinclude
.github/workflows/haskell-ci.ymldeleted−283
@@ -1,283 +0,0 @@
1−# This GitHub workflow config has been generated by a script via
2−#
3−# haskell-ci 'github' 'cabal.project'
4−#
5−# To regenerate the script (for example after adjusting tested-with) run
6−#
7−# haskell-ci regenerate
8−#
9−# For more information, see https://github.com/haskell-CI/haskell-ci
10−#
11−# version: 0.15.20220609
12−#
13−# REGENDATA ("0.15.20220609",["github","cabal.project"])
14−#
15−name: Haskell-CI
16−on:
17− push:
18− branches:
19− - master
20− pull_request:
21− branches:
22− - master
23−jobs:
24− linux:
25− name: Haskell-CI - Linux - ${{ matrix.compiler }}
26− runs-on: ubuntu-20.04
27− timeout-minutes:
28− 60
29− container:
30− image: buildpack-deps:bionic
31− continue-on-error: ${{ matrix.allow-failure }}
32− strategy:
33− matrix:
34− include:
35− - compiler: ghc-9.4.0.20220523
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
45− - compiler: ghc-9.0.2
46− compilerKind: ghc
47− compilerVersion: 9.0.2
48− setup-method: ghcup
49− allow-failure: false
50− - compiler: ghc-8.10.7
51− compilerKind: ghc
52− compilerVersion: 8.10.7
53− setup-method: ghcup
54− allow-failure: false
55− - compiler: ghc-8.8.4
56− compilerKind: ghc
57− compilerVersion: 8.8.4
58− setup-method: hvr-ppa
59− allow-failure: false
60− - compiler: ghc-8.6.5
61− compilerKind: ghc
62− compilerVersion: 8.6.5
63− setup-method: hvr-ppa
64− allow-failure: false
65− - compiler: ghc-8.4.4
66− compilerKind: ghc
67− compilerVersion: 8.4.4
68− setup-method: hvr-ppa
69− allow-failure: false
70− - compiler: ghc-8.2.2
71− compilerKind: ghc
72− compilerVersion: 8.2.2
73− setup-method: hvr-ppa
74− allow-failure: false
75− - compiler: ghc-8.0.2
76− compilerKind: ghc
77− compilerVersion: 8.0.2
78− setup-method: hvr-ppa
79− allow-failure: false
80− fail-fast: false
81− steps:
82− - name: apt
83− run: |
84− apt-get update
85− apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
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'
95− apt-get update
96− apt-get install -y "$HCNAME"
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:
103− HCKIND: ${{ matrix.compilerKind }}
104− HCNAME: ${{ matrix.compiler }}
105− HCVER: ${{ matrix.compilerVersion }}
106− - name: Set PATH and environment variables
107− run: |
108− echo "$HOME/.cabal/bin" >> $GITHUB_PATH
109− echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
110− echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
111− echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
112− HCDIR=/opt/$HCKIND/$HCVER
113− if [ "${{ matrix.setup-method }}" = ghcup ]; then
114− HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
115− echo "HC=$HC" >> "$GITHUB_ENV"
116− echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$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"
124− echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -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))')
128− echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
129− echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
130− 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
132− echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
133− echo "GHCJSARITH=0" >> "$GITHUB_ENV"
134− env:
135− HCKIND: ${{ matrix.compilerKind }}
136− HCNAME: ${{ matrix.compiler }}
137− HCVER: ${{ matrix.compilerVersion }}
138− - name: env
139− run: |
140− env
141− - name: write cabal config
142− run: |
143− mkdir -p $CABAL_DIR
144− cat >> $CABAL_CONFIG <<EOF
145− remote-build-reporting: anonymous
146− write-ghc-environment-files: never
147− remote-repo-cache: $CABAL_DIR/packages
148− logs-dir: $CABAL_DIR/logs
149− world-file: $CABAL_DIR/world
150− extra-prog-path: $CABAL_DIR/bin
151− symlink-bindir: $CABAL_DIR/bin
152− installdir: $CABAL_DIR/bin
153− build-summary: $CABAL_DIR/logs/build.log
154− store-dir: $CABAL_DIR/store
155− install-dirs user
156− prefix: $CABAL_DIR
157− repository hackage.haskell.org
158− url: http://hackage.haskell.org/
159− 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
177− - name: versions
178− run: |
179− $HC --version || true
180− $HC --print-project-git-commit-id || true
181− $CABAL --version || true
182− - name: update cabal index
183− run: |
184− $CABAL v2-update -v
185− - name: cache (tools)
186− uses: actions/cache@v2
187− with:
188− key: ${{ runner.os }}-${{ matrix.compiler }}-tools-445c2459
189− path: ~/.haskell-ci-tools
190− - name: install cabal-plan
191− run: |
192− mkdir -p $HOME/.cabal/bin
193− curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
194− echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
195− xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
196− rm -f cabal-plan.xz
197− chmod a+x $HOME/.cabal/bin/cabal-plan
198− cabal-plan --version
199− - name: install doctest
200− 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
202− if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi
203− - name: checkout
204− uses: actions/checkout@v2
205− with:
206− path: source
207− - name: initial cabal.project for sdist
208− run: |
209− touch cabal.project
210− echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
211− cat cabal.project
212− - name: sdist
213− run: |
214− mkdir -p sdist
215− $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
216− - name: unpack
217− run: |
218− mkdir -p unpacked
219− find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
220− - name: generate cabal.project
221− run: |
222− 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"
224− rm -f cabal.project cabal.project.local
225− touch cabal.project
226− touch cabal.project.local
227− echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
228− if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package http-api-data" >> cabal.project ; fi
229− if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
230− cat >> cabal.project <<EOF
231− 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
236− cat cabal.project
237− cat cabal.project.local
238− - name: dump install plan
239− run: |
240− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
241− cabal-plan
242− - name: cache
243− uses: actions/cache@v2
244− with:
245− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
246− path: ~/.cabal/store
247− restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
248− - name: install dependencies
249− run: |
250− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
251− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all
252− - name: build w/o tests
253− run: |
254− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
255− - name: build
256− run: |
257− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
258− - name: tests
259− run: |
260− $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
261− - name: doctest
262− run: |
263− 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
265− if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src/ ; fi
266− - name: cabal check
267− run: |
268− cd ${PKGDIR_http_api_data} || false
269− ${CABAL} -vnormal check
270− - name: haddock
271− run: |
272− $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
273− - name: unconstrained build
274− run: |
275− rm -f cabal.project.local
276− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
277− - name: prepare for constraint sets
278− run: |
279− rm -f cabal.project.local
280− - name: constraint set text-show
281− 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
.travis.ymlnew file+174
@@ -0,0 +1,174 @@
1+# This Travis job script has been generated by a script via
2+#
3+# haskell-ci '--config=cabal.haskell-ci' 'http-api-data.cabal'
4+#
5+# For more information, see https://github.com/haskell-CI/haskell-ci
6+#
7+# version: 0.7.20191106
8+#
9+language: c
10+dist: xenial
11+git:
12+ # whether to recursively clone submodules
13+ submodules: false
14+branches:
15+ only:
16+ - master
17+cache:
18+ directories:
19+ - $HOME/.cabal/packages
20+ - $HOME/.cabal/store
21+ - $HOME/.hlint
22+before_cache:
23+ - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
24+ # remove files that are regenerated by 'cabal update'
25+ - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
26+ - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
27+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
28+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
29+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
30+ - rm -rfv $CABALHOME/packages/head.hackage
31+matrix:
32+ include:
33+ - compiler: ghc-8.8.1
34+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
35+ - compiler: ghc-8.6.5
36+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
37+ - compiler: ghc-8.4.4
38+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
39+ - compiler: ghc-8.2.2
40+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
41+ - compiler: ghc-8.0.2
42+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
43+ - compiler: ghc-7.10.3
44+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
45+ - compiler: ghc-7.8.4
46+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
47+before_install:
48+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
49+ - WITHCOMPILER="-w $HC"
50+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
51+ - HCPKG="$HC-pkg"
52+ - unset CC
53+ - CABAL=/opt/ghc/bin/cabal
54+ - CABALHOME=$HOME/.cabal
55+ - export PATH="$CABALHOME/bin:$PATH"
56+ - TOP=$(pwd)
57+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
58+ - echo $HCNUMVER
59+ - CABAL="$CABAL -vnormal+nowrap+markoutput"
60+ - set -o pipefail
61+ - |
62+ echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
63+ echo 'BEGIN { state = "output"; }' >> .colorful.awk
64+ echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
65+ echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
66+ echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
67+ echo ' if (state == "cabal") {' >> .colorful.awk
68+ echo ' print blue($0)' >> .colorful.awk
69+ echo ' } else {' >> .colorful.awk
70+ echo ' print $0' >> .colorful.awk
71+ echo ' }' >> .colorful.awk
72+ echo '}' >> .colorful.awk
73+ - cat .colorful.awk
74+ - |
75+ color_cabal_output () {
76+ awk -f $TOP/.colorful.awk
77+ }
78+ - echo text | color_cabal_output
79+install:
80+ - ${CABAL} --version
81+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
82+ - TEST=--enable-tests
83+ - BENCH=--enable-benchmarks
84+ - HEADHACKAGE=false
85+ - rm -f $CABALHOME/config
86+ - |
87+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
88+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
89+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
90+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
91+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
92+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
93+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
94+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
95+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
96+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
97+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
98+ echo "install-dirs user" >> $CABALHOME/config
99+ echo " prefix: $CABALHOME" >> $CABALHOME/config
100+ echo "repository hackage.haskell.org" >> $CABALHOME/config
101+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
102+ echo " secure: True" >> $CABALHOME/config
103+ echo " key-threshold: 3" >> $CABALHOME/config
104+ echo " root-keys:" >> $CABALHOME/config
105+ echo " fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
106+ echo " 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
107+ echo " 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
108+ echo " 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
109+ echo " 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
110+ - |
111+ echo "program-default-options" >> $CABALHOME/config
112+ echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
113+ - cat $CABALHOME/config
114+ - rm -fv cabal.project cabal.project.local cabal.project.freeze
115+ - travis_retry ${CABAL} v2-update -v
116+ - if [ $HCNUMVER -ge 80000 ] ; then (cd /tmp && ${CABAL} v2-install $WITHCOMPILER -j2 doctest --constraint='doctest ==0.16.*' | color_cabal_output) ; fi
117+ # Generate cabal.project
118+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
119+ - touch cabal.project
120+ - |
121+ echo "packages: ." >> cabal.project
122+ - |
123+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
124+ - cat cabal.project || true
125+ - cat cabal.project.local || true
126+ - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
127+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
128+ - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
129+ - rm cabal.project.freeze
130+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
131+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
132+script:
133+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
134+ # Packaging...
135+ - ${CABAL} v2-sdist all | color_cabal_output
136+ # Unpacking...
137+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
138+ - cd ${DISTDIR} || false
139+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
140+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
141+ - PKGDIR_http_api_data="$(find . -maxdepth 1 -type d -regex '.*/http-api-data-[0-9.]*')"
142+ # Generate cabal.project
143+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
144+ - touch cabal.project
145+ - |
146+ echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
147+ - |
148+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
149+ - cat cabal.project || true
150+ - cat cabal.project.local || true
151+ # Building...
152+ # this builds all libraries and executables (without tests/benchmarks)
153+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
154+ # Building with tests and benchmarks...
155+ # build & run tests, build benchmarks
156+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
157+ # Testing...
158+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
159+ # Doctest...
160+ - if [ $HCNUMVER -ge 80000 ] ; then (cd ${PKGDIR_http_api_data} && doctest src/) ; fi
161+ # cabal check...
162+ - (cd ${PKGDIR_http_api_data} && ${CABAL} -vnormal check)
163+ # haddock...
164+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
165+ # Building without installed constraints for packages in global-db...
166+ - rm -f cabal.project.local
167+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
168+ # Constraint sets
169+ - rm -rf cabal.project.local
170+ # Constraint set text-show
171+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all | color_cabal_output
172+
173+# REGENDATA ("0.7.20191106",["--config=cabal.haskell-ci","http-api-data.cabal"])
174+# EOF
CHANGELOG.md−24
@@ -1,27 +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−
8−0.4.3
9−-----
10−
11−* Add `Quarter`, `QuarterOfYear` and `Month` instances
12−* Support `bytestring-0.11`
13−
14−0.4.2
15−-----
16−
17−* Add instances for `Const` and `Identity`
18−
19−0.4.1.1
20−-------
21−
22−* Allow cookie <0.5
23−* Change to `build-type: Simple`
24−
2510.4.1
262-----
273
cabal.haskell-ci+1−2
@@ -1,6 +1,5 @@
11branches: master
2−doctest: <9
3−doctest-filter-packages: base-compat
2+doctest: True
43
54constraint-set text-show
65 constraints: http-api-data +use-text-show
http-api-data.cabal+34−27
@@ -1,6 +1,6 @@
11cabal-version: >= 1.10
22name: http-api-data
3−version: 0.5
3+version: 0.4.1.1
44
55synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.
66category: Web
@@ -24,15 +24,13 @@ extra-source-files:
2424 README.md
2525
2626tested-with:
27+ GHC==7.8.4,
28+ GHC==7.10.3,
2729 GHC==8.0.2,
2830 GHC==8.2.2,
2931 GHC==8.4.4,
3032 GHC==8.6.5,
31− GHC==8.8.4,
32− GHC==8.10.7,
33− GHC==9.0.2,
34− GHC==9.2.3,
35− GHC==9.4.1
33+ GHC==8.8.1
3634
3735flag use-text-show
3836 description: Use text-show library for efficient ToHttpApiData implementations.
@@ -44,28 +42,39 @@ library
4442 include-dirs: include/
4543
4644 -- GHC bundled
47− build-depends: base >= 4.9 && < 4.17
48− , bytestring >= 0.10.8.1 && < 0.12
49− , containers >= 0.5.7.1 && < 0.7
50− , text >= 1.2.3.0 && < 1.3 || >=2.0 && <2.1
51− , transformers >= 0.5.2.0 && < 0.7
45+ build-depends: base >= 4.7 && < 4.14
46+ , bytestring >= 0.10.4.0 && < 0.11
47+ , containers >= 0.5.5.1 && < 0.7
48+ , text >= 1.2.3.0 && < 1.3
49+
50+ -- so Semigroup Builder exists
51+ if impl(ghc >= 8.0)
52+ build-depends: bytestring >= 0.10.8.1
5253
5354 -- other-dependencies
5455 build-depends:
55− attoparsec >= 0.13.2.2 && < 0.15
56− , attoparsec-iso8601 >= 1.1.0.0 && < 1.2
57− , base-compat >= 0.10.5 && < 0.13
56+ attoparsec >= 0.13.2.2 && < 0.14
57+ , attoparsec-iso8601 >= 1.0.1.0 && < 1.1
58+ , base-compat >= 0.10.5 && < 0.12
5859 , cookie >= 0.4.3 && < 0.5
59− , hashable >= 1.2.7.0 && < 1.5
60+ , hashable >= 1.2.7.0 && < 1.4
6061 , http-types >= 0.12.3 && < 0.13
6162 , tagged >= 0.8.5 && < 0.9
62− , time-compat >= 1.9.5 && < 1.10
63− , unordered-containers >= 0.2.10.0 && < 0.3
64− , uuid-types >= 1.0.3 && < 1.1
63+ , time-compat >= 1.9.2 && < 1.10
64+ , unordered-containers >= 0.2.10.0 && < 0.3
65+ , uuid-types >= 1.0.3 && <1.1
66+
67+ if !impl(ghc >= 7.10)
68+ build-depends:
69+ nats >= 1.1.2 && < 1.2,
70+ void >= 0.7.3 && < 0.8
71+
72+ if !impl(ghc >= 8.0)
73+ build-depends: semigroups >= 0.18.5 && < 0.20
6574
6675 if flag(use-text-show)
6776 cpp-options: -DUSE_TEXT_SHOW
68− build-depends: text-show >= 3.8.2 && <3.10
77+ build-depends: text-show >= 3.8.2 && <3.9
6978
7079 exposed-modules:
7180 Web.HttpApiData
@@ -85,7 +94,7 @@ test-suite spec
8594 hs-source-dirs: test
8695 ghc-options: -Wall
8796 default-language: Haskell2010
88− build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.11
97+ build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.8
8998 -- inherited depndencies
9099 build-depends:
91100 base
@@ -93,18 +102,16 @@ test-suite spec
93102 , bytestring
94103 , cookie
95104 , http-api-data
105+ , nats
96106 , text
97107 , time-compat
98108 , unordered-containers
99109 , uuid-types
100110
101− if !impl(ghc >= 7.10)
102− build-depends: nats
103−
104− build-depends: HUnit >= 1.6.0.0 && <1.7
105− , hspec >= 2.7.1 && <2.11
106− , QuickCheck >= 2.13.1 && <2.15
107− , quickcheck-instances >= 0.3.25.2 && <0.4
111+ build-depends: HUnit >= 1.6.0.0 && <1.7
112+ , hspec >= 2.7.1 && <2.8
113+ , QuickCheck >= 2.13.1 && <2.14
114+ , quickcheck-instances >= 0.3.21 && <0.4
108115
109116source-repository head
110117 type: git
src/Web/Internal/FormUrlEncoded.hs+1−25
@@ -1,5 +1,5 @@
1−{-# LANGUAGE ConstraintKinds #-}
21{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
33{-# LANGUAGE DataKinds #-}
44{-# LANGUAGE DefaultSignatures #-}
55{-# LANGUAGE DeriveGeneric #-}
@@ -20,7 +20,6 @@ module Web.Internal.FormUrlEncoded where
2020import Prelude ()
2121import Prelude.Compat
2222
23−import Control.Applicative (Const(Const))
2423import Control.Arrow ((***))
2524import Control.Monad ((<=<))
2625import Data.ByteString.Builder (shortByteString, toLazyByteString)
@@ -28,7 +27,6 @@ import qualified Data.ByteString.Lazy as BSL
2827import qualified Data.ByteString.Lazy.Char8 as BSL8
2928import Data.Coerce (coerce)
3029import qualified Data.Foldable as F
31−import Data.Functor.Identity (Identity(Identity))
3230import Data.Hashable (Hashable)
3331import Data.HashMap.Strict (HashMap)
3432import qualified Data.HashMap.Strict as HashMap
@@ -52,8 +50,6 @@ import Data.Text.Encoding.Error (lenientDecode)
5250import qualified Data.Text.Lazy as Lazy
5351import Data.Time.Compat (Day, LocalTime, NominalDiffTime,
5452 UTCTime, ZonedTime)
55−import Data.Time.Calendar.Month.Compat (Month)
56−import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..))
5753import Data.Void (Void)
5854import Data.Word (Word16, Word32, Word64, Word8)
5955import GHC.Exts (Constraint, IsList (..))
@@ -115,9 +111,6 @@ instance ToFormKey LocalTime where toFormKey = toQueryParam
115111instance ToFormKey ZonedTime where toFormKey = toQueryParam
116112instance ToFormKey UTCTime where toFormKey = toQueryParam
117113instance ToFormKey NominalDiffTime where toFormKey = toQueryParam
118−instance ToFormKey Quarter where toFormKey = toQueryParam
119−instance ToFormKey QuarterOfYear where toFormKey = toQueryParam
120−instance ToFormKey Month where toFormKey = toQueryParam
121114
122115instance ToFormKey String where toFormKey = toQueryParam
123116instance ToFormKey Text where toFormKey = toQueryParam
@@ -137,13 +130,6 @@ instance ToFormKey a => ToFormKey (Semi.Last a) where toFormKey = coerce (toFor
137130
138131instance ToFormKey a => ToFormKey (Tagged b a) where toFormKey = coerce (toFormKey :: a -> Text)
139132
140−-- | @since 0.4.2
141−instance ToFormKey a => ToFormKey (Identity a) where toFormKey = coerce (toFormKey :: a -> Text)
142−
143−-- | @since 0.4.2
144−instance ToFormKey a => ToFormKey (Const a b) where
145− toFormKey = coerce (toFormKey :: a -> Text)
146−
147133instance ToFormKey Void where toFormKey = toQueryParam
148134instance ToFormKey Natural where toFormKey = toQueryParam
149135
@@ -177,9 +163,6 @@ instance FromFormKey LocalTime where parseFormKey = parseQueryParam
177163instance FromFormKey ZonedTime where parseFormKey = parseQueryParam
178164instance FromFormKey UTCTime where parseFormKey = parseQueryParam
179165instance FromFormKey NominalDiffTime where parseFormKey = parseQueryParam
180−instance FromFormKey Quarter where parseFormKey = parseQueryParam
181−instance FromFormKey QuarterOfYear where parseFormKey = parseQueryParam
182−instance FromFormKey Month where parseFormKey = parseQueryParam
183166
184167instance FromFormKey String where parseFormKey = parseQueryParam
185168instance FromFormKey Text where parseFormKey = parseQueryParam
@@ -199,13 +182,6 @@ instance FromFormKey a => FromFormKey (Semi.Last a) where parseFormKey = coerce
199182
200183instance FromFormKey a => FromFormKey (Tagged b a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
201184
202−-- | @since 0.4.2
203−instance FromFormKey a => FromFormKey (Identity a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
204−
205−-- | @since 0.4.2
206−instance FromFormKey a => FromFormKey (Const a b) where
207− parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
208−
209185instance FromFormKey Void where parseFormKey = parseQueryParam
210186instance FromFormKey Natural where parseFormKey = parseQueryParam
211187
src/Web/Internal/HttpApiData.hs+12−107
@@ -5,9 +5,7 @@
55{-# LANGUAGE DeriveFunctor #-}
66{-# LANGUAGE DeriveTraversable #-}
77{-# LANGUAGE FlexibleInstances #-}
8−{-# LANGUAGE KindSignatures #-}
98{-# LANGUAGE OverloadedStrings #-}
10−{-# LANGUAGE PolyKinds #-}
119{-# LANGUAGE ScopedTypeVariables #-}
1210{-# LANGUAGE TypeSynonymInstances #-}
1311-- |
@@ -18,7 +16,6 @@ module Web.Internal.HttpApiData where
1816import Prelude ()
1917import Prelude.Compat
2018
21−import Control.Applicative (Const(Const))
2219import Control.Arrow (left, (&&&))
2320import Control.Monad ((<=<))
2421import qualified Data.Attoparsec.Text as Atto
@@ -30,9 +27,7 @@ import qualified Data.ByteString.Lazy as LBS
3027import Data.Coerce (coerce)
3128import Data.Data (Data)
3229import qualified Data.Fixed as F
33−import Data.Functor.Identity (Identity(Identity))
3430import Data.Int (Int16, Int32, Int64, Int8)
35−import Data.Kind (Type)
3631import qualified Data.Map as Map
3732import Data.Monoid (All (..), Any (..), Dual (..),
3833 First (..), Last (..),
@@ -56,9 +51,6 @@ import Data.Time.Compat (Day, FormatTime, LocalTime,
5651 secondsToNominalDiffTime)
5752import Data.Time.Format.Compat (defaultTimeLocale,
5853 iso8601DateFormat)
59−import Data.Time.Calendar.Month.Compat (Month)
60−import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..),
61− toYearQuarter)
6254import Data.Typeable (Typeable)
6355import qualified Data.UUID.Types as UUID
6456import Data.Version (Version, parseVersion,
@@ -72,10 +64,14 @@ import Text.Read (readMaybe)
7264import Web.Cookie (SetCookie, parseSetCookie,
7365 renderSetCookie)
7466
67+
7568#if USE_TEXT_SHOW
7669import TextShow (TextShow, showt)
7770#endif
7871
72+
73+
74+
7975-- $setup
8076-- >>> data BasicAuthToken = BasicAuthToken Text deriving (Show)
8177-- >>> instance FromHttpApiData BasicAuthToken where parseHeader h = BasicAuthToken <$> parseHeaderWithPrefix "Basic " h; parseQueryParam p = BasicAuthToken <$> parseQueryParam p
@@ -96,7 +92,7 @@ class ToHttpApiData a where
9692 -- The default definition uses 'H.encodePathSegmentsRelative',
9793 -- but this may be overriden with a more efficient version.
9894 toEncodedUrlPiece :: a -> BS.Builder
99− toEncodedUrlPiece = H.urlEncodeBuilder True . encodeUtf8 . toUrlPiece
95+ toEncodedUrlPiece = H.encodePathSegmentsRelative . (:[]) . toUrlPiece
10096
10197 -- | Convert to HTTP header value.
10298 toHeader :: a -> ByteString
@@ -338,7 +334,7 @@ lookupBoundedEnumOf f = flip lookup (map (f &&& id) [minBound..maxBound])
338334-- >>> parseBoundedEnumOf toUrlPiece "true" :: Either Text Bool
339335-- Right True
340336--
341−-- For case insensitive parser see 'parseBoundedEnumOfI'.
337+-- For case sensitive parser see 'parseBoundedEnumOfI'.
342338parseBoundedEnumOf :: (Bounded a, Enum a) => (a -> Text) -> Text -> Either Text a
343339parseBoundedEnumOf = parseMaybeTextData . lookupBoundedEnumOf
344340
@@ -459,8 +455,7 @@ instance ToHttpApiData Word16 where toUrlPiece = showt; toEncodedUrlPiece = un
459455instance ToHttpApiData Word32 where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
460456instance ToHttpApiData Word64 where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
461457
462−-- | Note: this instance is not polykinded
463−instance F.HasResolution a => ToHttpApiData (F.Fixed (a :: Type)) where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
458+instance F.HasResolution a => ToHttpApiData (F.Fixed a) where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
464459
465460-- |
466461-- >>> toUrlPiece (fromGregorian 2015 10 03)
@@ -514,42 +509,6 @@ instance ToHttpApiData DayOfWeek where
514509
515510 toEncodedUrlPiece = unsafeToEncodedUrlPiece
516511
517−-- |
518−-- >>> toUrlPiece Q4
519−-- "q4"
520−instance ToHttpApiData QuarterOfYear where
521− toUrlPiece Q1 = "q1"
522− toUrlPiece Q2 = "q2"
523− toUrlPiece Q3 = "q3"
524− toUrlPiece Q4 = "q4"
525−
526−-- |
527−-- >>> import Data.Time.Calendar.Quarter.Compat (Quarter (..))
528−-- >>> MkQuarter 8040
529−-- 2010-Q1
530−--
531−-- >>> toUrlPiece $ MkQuarter 8040
532−-- "2010-q1"
533−--
534−instance ToHttpApiData Quarter where
535− toUrlPiece q = case toYearQuarter q of
536− (y, qoy) -> T.pack (show y ++ "-" ++ f qoy)
537− where
538− f Q1 = "q1"
539− f Q2 = "q2"
540− f Q3 = "q3"
541− f Q4 = "q4"
542−
543−-- |
544−-- >>> import Data.Time.Calendar.Month.Compat (Month (..))
545−-- >>> MkMonth 24482
546−-- 2040-03
547−--
548−-- >>> toUrlPiece $ MkMonth 24482
549−-- "2040-03"
550−--
551−instance ToHttpApiData Month where
552− toUrlPiece = T.pack . formatTime defaultTimeLocale "%Y-%m"
553512
554513instance ToHttpApiData NominalDiffTime where
555514 toUrlPiece = toUrlPiece . nominalDiffTimeToSeconds
@@ -633,22 +592,7 @@ instance ToHttpApiData SetCookie where
633592 toHeader = LBS.toStrict . BS.toLazyByteString . renderSetCookie
634593 -- toEncodedUrlPiece = renderSetCookie -- doesn't do things.
635594
636−-- | Note: this instance is not polykinded
637−instance ToHttpApiData a => ToHttpApiData (Tagged (b :: Type) a) where
638− toUrlPiece = coerce (toUrlPiece :: a -> Text)
639− toHeader = coerce (toHeader :: a -> ByteString)
640− toQueryParam = coerce (toQueryParam :: a -> Text)
641− toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
642−
643−-- | @since 0.4.2
644−instance ToHttpApiData a => ToHttpApiData (Const a b) where
645− toUrlPiece = coerce (toUrlPiece :: a -> Text)
646− toHeader = coerce (toHeader :: a -> ByteString)
647− toQueryParam = coerce (toQueryParam :: a -> Text)
648− toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
649−
650−-- | @since 0.4.2
651−instance ToHttpApiData a => ToHttpApiData (Identity a) where
595+instance ToHttpApiData a => ToHttpApiData (Tagged b a) where
652596 toUrlPiece = coerce (toUrlPiece :: a -> Text)
653597 toHeader = coerce (toHeader :: a -> ByteString)
654598 toQueryParam = coerce (toQueryParam :: a -> Text)
@@ -706,8 +650,7 @@ instance FromHttpApiData String where parseUrlPiece = Right . T.unpack
706650instance FromHttpApiData Text where parseUrlPiece = Right
707651instance FromHttpApiData L.Text where parseUrlPiece = Right . L.fromStrict
708652
709−-- | Note: this instance is not polykinded
710−instance F.HasResolution a => FromHttpApiData (F.Fixed (a :: Type)) where
653+instance F.HasResolution a => FromHttpApiData (F.Fixed a) where
711654 parseUrlPiece = runReader rational
712655
713656-- |
@@ -738,9 +681,6 @@ instance FromHttpApiData ZonedTime where parseUrlPiece = runAtto Atto.zonedTime
738681-- Right 2015-10-03 00:14:24 UTC
739682instance FromHttpApiData UTCTime where parseUrlPiece = runAtto Atto.utcTime
740683
741−-- |
742−-- >>> parseUrlPiece "Monday" :: Either Text DayOfWeek
743−-- Right Monday
744684instance FromHttpApiData DayOfWeek where
745685 parseUrlPiece t = case Map.lookup (T.toLower t) m of
746686 Just dow -> Right dow
@@ -752,30 +692,6 @@ instance FromHttpApiData DayOfWeek where
752692
753693instance FromHttpApiData NominalDiffTime where parseUrlPiece = fmap secondsToNominalDiffTime . parseUrlPiece
754694
755−-- |
756−-- >>> parseUrlPiece "2021-01" :: Either Text Month
757−-- Right 2021-01
758−instance FromHttpApiData Month where parseUrlPiece = runAtto Atto.month
759−
760−-- |
761−-- >>> parseUrlPiece "2021-q1" :: Either Text Quarter
762−-- Right 2021-Q1
763−instance FromHttpApiData Quarter where parseUrlPiece = runAtto Atto.quarter
764−
765−-- |
766−-- >>> parseUrlPiece "q2" :: Either Text QuarterOfYear
767−-- Right Q2
768−--
769−-- >>> parseUrlPiece "Q3" :: Either Text QuarterOfYear
770−-- Right Q3
771−instance FromHttpApiData QuarterOfYear where
772− parseUrlPiece t = case T.toLower t of
773− "q1" -> return Q1
774− "q2" -> return Q2
775− "q3" -> return Q3
776− "q4" -> return Q4
777− _ -> Left "Invalid quarter of year"
778−
779695instance FromHttpApiData All where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text Bool)
780696instance FromHttpApiData Any where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text Bool)
781697
@@ -839,20 +755,7 @@ instance FromHttpApiData SetCookie where
839755 parseUrlPiece = parseHeader . encodeUtf8
840756 parseHeader = Right . parseSetCookie
841757
842−-- | Note: this instance is not polykinded
843−instance FromHttpApiData a => FromHttpApiData (Tagged (b :: Type) a) where
844− parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
845− parseHeader = coerce (parseHeader :: ByteString -> Either Text a)
846− parseQueryParam = coerce (parseQueryParam :: Text -> Either Text a)
847−
848−-- | @since 0.4.2
849−instance FromHttpApiData a => FromHttpApiData (Const a b) where
850− parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
851− parseHeader = coerce (parseHeader :: ByteString -> Either Text a)
852− parseQueryParam = coerce (parseQueryParam :: Text -> Either Text a)
853−
854−-- | @since 0.4.2
855−instance FromHttpApiData a => FromHttpApiData (Identity a) where
758+instance FromHttpApiData a => FromHttpApiData (Tagged b a) where
856759 parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
857760 parseHeader = coerce (parseHeader :: ByteString -> Either Text a)
858761 parseQueryParam = coerce (parseQueryParam :: Text -> Either Text a)
@@ -865,3 +768,5 @@ runAtto :: Atto.Parser a -> Text -> Either Text a
865768runAtto p t = case Atto.parseOnly (p <* Atto.endOfInput) t of
866769 Left err -> Left (T.pack err)
867770 Right x -> Right x
771+
772+
test/Web/Internal/HttpApiDataSpec.hs−6
@@ -14,8 +14,6 @@ import qualified Data.Text as T
1414import qualified Data.Text.Encoding as TE
1515import qualified Data.Text.Lazy as L
1616import Data.Time.Compat
17−import Data.Time.Calendar.Month.Compat (Month)
18−import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..))
1917import qualified Data.UUID.Types as UUID
2018import Data.Version
2119import Data.Word
@@ -89,10 +87,6 @@ spec = do
8987 checkUrlPiece (Proxy :: Proxy UTCTime) "UTCTime"
9088 checkUrlPiece (Proxy :: Proxy NominalDiffTime) "NominalDiffTime"
9189 checkUrlPiece (Proxy :: Proxy DayOfWeek) "DayOfWeek"
92− checkUrlPiece (Proxy :: Proxy Quarter) "Quarter"
93− checkUrlPiece (Proxy :: Proxy QuarterOfYear) "QuarterOfYear"
94− checkUrlPiece (Proxy :: Proxy Month) "Month"
95− checkUrlPiece (Proxy :: Proxy DayOfWeek) "DayOfWeek"
9690 checkUrlPiece (Proxy :: Proxy Version) "Version"
9791 checkUrlPiece (Proxy :: Proxy UUID.UUID) "UUID"
9892 checkUrlPiece' setCookieGen "Cookie"