git.iko.soy/typeable/uuid
on 659d495 help sign in
49f50ae
swap
0 ahead, 112 behind
.git-blame-ignore-revsdeleted−2
since splitsnapshots
unifiedsplit
@@ -1,2 +0,0 @@
1−# Move code into subdirectories
2−bf1ac1bad848bb2c081f0cae1631bf53811ec05a
.github/workflows/haskell-ci-bench.ymldeleted−241
@@ -1,241 +0,0 @@
1−# This GitHub workflow config has been generated by a script via
2−#
3−# haskell-ci 'github' '--project' 'cabal.bench.project' '-o' '.github/workflows/haskell-ci-bench.yml' '--github-action-name' 'Benchmarks'
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.19.20240702
12−#
13−# REGENDATA ("0.19.20240702",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
14−#
15−name: Benchmarks
16−on:
17− push:
18− branches:
19− - master
20− pull_request:
21− branches:
22− - master
23−jobs:
24− linux:
25− name: Benchmarks - Linux - ${{ matrix.compiler }}
26− runs-on: ubuntu-20.04
27− timeout-minutes:
28− 60
29− container:
30− image: buildpack-deps:jammy
31− continue-on-error: ${{ matrix.allow-failure }}
32− strategy:
33− matrix:
34− include:
35− - compiler: ghc-9.10.1
36− compilerKind: ghc
37− compilerVersion: 9.10.1
38− setup-method: ghcup
39− allow-failure: false
40− - compiler: ghc-9.8.2
41− compilerKind: ghc
42− compilerVersion: 9.8.2
43− setup-method: ghcup
44− allow-failure: false
45− - compiler: ghc-9.6.6
46− compilerKind: ghc
47− compilerVersion: 9.6.6
48− setup-method: ghcup
49− allow-failure: false
50− - compiler: ghc-9.4.8
51− compilerKind: ghc
52− compilerVersion: 9.4.8
53− setup-method: ghcup
54− allow-failure: false
55− - compiler: ghc-9.2.8
56− compilerKind: ghc
57− compilerVersion: 9.2.8
58− setup-method: ghcup
59− allow-failure: false
60− - compiler: ghc-9.0.2
61− compilerKind: ghc
62− compilerVersion: 9.0.2
63− setup-method: ghcup
64− allow-failure: false
65− - compiler: ghc-8.10.7
66− compilerKind: ghc
67− compilerVersion: 8.10.7
68− setup-method: ghcup
69− allow-failure: false
70− - compiler: ghc-8.8.4
71− compilerKind: ghc
72− compilerVersion: 8.8.4
73− setup-method: ghcup
74− allow-failure: false
75− - compiler: ghc-8.6.5
76− compilerKind: ghc
77− compilerVersion: 8.6.5
78− setup-method: ghcup
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− mkdir -p "$HOME/.ghcup/bin"
87− curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
88− chmod a+x "$HOME/.ghcup/bin/ghcup"
89− "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
90− "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
91− env:
92− HCKIND: ${{ matrix.compilerKind }}
93− HCNAME: ${{ matrix.compiler }}
94− HCVER: ${{ matrix.compilerVersion }}
95− - name: Set PATH and environment variables
96− run: |
97− echo "$HOME/.cabal/bin" >> $GITHUB_PATH
98− echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
99− echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
100− echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
101− HCDIR=/opt/$HCKIND/$HCVER
102− HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
103− HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
104− HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
105− echo "HC=$HC" >> "$GITHUB_ENV"
106− echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
107− echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
108− echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
109− HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
110− echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
111− echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
112− echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
113− echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
114− echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
115− echo "GHCJSARITH=0" >> "$GITHUB_ENV"
116− env:
117− HCKIND: ${{ matrix.compilerKind }}
118− HCNAME: ${{ matrix.compiler }}
119− HCVER: ${{ matrix.compilerVersion }}
120− - name: env
121− run: |
122− env
123− - name: write cabal config
124− run: |
125− mkdir -p $CABAL_DIR
126− cat >> $CABAL_CONFIG <<EOF
127− remote-build-reporting: anonymous
128− write-ghc-environment-files: never
129− remote-repo-cache: $CABAL_DIR/packages
130− logs-dir: $CABAL_DIR/logs
131− world-file: $CABAL_DIR/world
132− extra-prog-path: $CABAL_DIR/bin
133− symlink-bindir: $CABAL_DIR/bin
134− installdir: $CABAL_DIR/bin
135− build-summary: $CABAL_DIR/logs/build.log
136− store-dir: $CABAL_DIR/store
137− install-dirs user
138− prefix: $CABAL_DIR
139− repository hackage.haskell.org
140− url: http://hackage.haskell.org/
141− EOF
142− cat >> $CABAL_CONFIG <<EOF
143− program-default-options
144− ghc-options: $GHCJOBS +RTS -M3G -RTS
145− EOF
146− cat $CABAL_CONFIG
147− - name: versions
148− run: |
149− $HC --version || true
150− $HC --print-project-git-commit-id || true
151− $CABAL --version || true
152− - name: update cabal index
153− run: |
154− $CABAL v2-update -v
155− - name: install cabal-plan
156− run: |
157− mkdir -p $HOME/.cabal/bin
158− curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
159− echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
160− xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
161− rm -f cabal-plan.xz
162− chmod a+x $HOME/.cabal/bin/cabal-plan
163− cabal-plan --version
164− - name: checkout
165− uses: actions/checkout@v4
166− with:
167− path: source
168− - name: initial cabal.project for sdist
169− run: |
170− touch cabal.project
171− echo "packages: $GITHUB_WORKSPACE/source/uuid-bench" >> cabal.project
172− cat cabal.project
173− - name: sdist
174− run: |
175− mkdir -p sdist
176− $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
177− - name: unpack
178− run: |
179− mkdir -p unpacked
180− find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
181− - name: generate cabal.project
182− run: |
183− PKGDIR_uuid_bench="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/uuid-bench-[0-9.]*')"
184− echo "PKGDIR_uuid_bench=${PKGDIR_uuid_bench}" >> "$GITHUB_ENV"
185− rm -f cabal.project cabal.project.local
186− touch cabal.project
187− touch cabal.project.local
188− echo "packages: ${PKGDIR_uuid_bench}" >> cabal.project
189− echo "package uuid-bench" >> cabal.project
190− echo " ghc-options: -Werror=missing-methods" >> cabal.project
191− cat >> cabal.project <<EOF
192− EOF
193− $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(uuid-bench)$/; }' >> cabal.project.local
194− cat cabal.project
195− cat cabal.project.local
196− - name: dump install plan
197− run: |
198− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
199− cabal-plan
200− - name: restore cache
201− uses: actions/cache/restore@v4
202− with:
203− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
204− path: ~/.cabal/store
205− restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
206− - name: install dependencies
207− run: |
208− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
209− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all
210− - name: build w/o tests
211− run: |
212− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
213− - name: build
214− run: |
215− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
216− - name: cabal check
217− run: |
218− cd ${PKGDIR_uuid_bench} || false
219− ${CABAL} -vnormal check
220− - name: haddock
221− run: |
222− $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
223− - name: unconstrained build
224− run: |
225− rm -f cabal.project.local
226− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
227− - name: prepare for constraint sets
228− run: |
229− rm -f cabal.project.local
230− - name: constraint set random-1.2
231− run: |
232− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all --dry-run
233− cabal-plan topo | sort
234− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all
235− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all
236− - name: save cache
237− uses: actions/cache/save@v4
238− if: always()
239− with:
240− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
241− path: ~/.cabal/store
.github/workflows/haskell-ci.ymldeleted−262
@@ -1,262 +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.19.20241223
12−#
13−# REGENDATA ("0.19.20241223",["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:jammy
31− continue-on-error: ${{ matrix.allow-failure }}
32− strategy:
33− matrix:
34− include:
35− - compiler: ghc-9.12.1
36− compilerKind: ghc
37− compilerVersion: 9.12.1
38− setup-method: ghcup
39− allow-failure: false
40− - compiler: ghc-9.10.1
41− compilerKind: ghc
42− compilerVersion: 9.10.1
43− setup-method: ghcup
44− allow-failure: false
45− - compiler: ghc-9.8.4
46− compilerKind: ghc
47− compilerVersion: 9.8.4
48− setup-method: ghcup
49− allow-failure: false
50− - compiler: ghc-9.6.6
51− compilerKind: ghc
52− compilerVersion: 9.6.6
53− setup-method: ghcup
54− allow-failure: false
55− - compiler: ghc-9.4.8
56− compilerKind: ghc
57− compilerVersion: 9.4.8
58− setup-method: ghcup
59− allow-failure: false
60− - compiler: ghc-9.2.8
61− compilerKind: ghc
62− compilerVersion: 9.2.8
63− setup-method: ghcup
64− allow-failure: false
65− - compiler: ghc-9.0.2
66− compilerKind: ghc
67− compilerVersion: 9.0.2
68− setup-method: ghcup
69− allow-failure: false
70− - compiler: ghc-8.10.7
71− compilerKind: ghc
72− compilerVersion: 8.10.7
73− setup-method: ghcup
74− allow-failure: false
75− - compiler: ghc-8.8.4
76− compilerKind: ghc
77− compilerVersion: 8.8.4
78− setup-method: ghcup
79− allow-failure: false
80− - compiler: ghc-8.6.5
81− compilerKind: ghc
82− compilerVersion: 8.6.5
83− setup-method: ghcup
84− allow-failure: false
85− fail-fast: false
86− steps:
87− - name: apt-get install
88− run: |
89− apt-get update
90− apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
91− - name: Install GHCup
92− run: |
93− mkdir -p "$HOME/.ghcup/bin"
94− curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
95− chmod a+x "$HOME/.ghcup/bin/ghcup"
96− - name: Install cabal-install
97− run: |
98− "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
99− echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
100− - name: Install GHC (GHCup)
101− if: matrix.setup-method == 'ghcup'
102− run: |
103− "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
104− HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
105− HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
106− HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
107− echo "HC=$HC" >> "$GITHUB_ENV"
108− echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
109− echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
110− env:
111− HCKIND: ${{ matrix.compilerKind }}
112− HCNAME: ${{ matrix.compiler }}
113− HCVER: ${{ matrix.compilerVersion }}
114− - name: Set PATH and environment variables
115− run: |
116− echo "$HOME/.cabal/bin" >> $GITHUB_PATH
117− echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
118− echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
119− echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
120− HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
121− echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
122− echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
123− echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
124− echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
125− echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
126− env:
127− HCKIND: ${{ matrix.compilerKind }}
128− HCNAME: ${{ matrix.compiler }}
129− HCVER: ${{ matrix.compilerVersion }}
130− - name: env
131− run: |
132− env
133− - name: write cabal config
134− run: |
135− mkdir -p $CABAL_DIR
136− cat >> $CABAL_CONFIG <<EOF
137− remote-build-reporting: anonymous
138− write-ghc-environment-files: never
139− remote-repo-cache: $CABAL_DIR/packages
140− logs-dir: $CABAL_DIR/logs
141− world-file: $CABAL_DIR/world
142− extra-prog-path: $CABAL_DIR/bin
143− symlink-bindir: $CABAL_DIR/bin
144− installdir: $CABAL_DIR/bin
145− build-summary: $CABAL_DIR/logs/build.log
146− store-dir: $CABAL_DIR/store
147− install-dirs user
148− prefix: $CABAL_DIR
149− repository hackage.haskell.org
150− url: http://hackage.haskell.org/
151− EOF
152− cat >> $CABAL_CONFIG <<EOF
153− program-default-options
154− ghc-options: $GHCJOBS +RTS -M3G -RTS
155− EOF
156− cat $CABAL_CONFIG
157− - name: versions
158− run: |
159− $HC --version || true
160− $HC --print-project-git-commit-id || true
161− $CABAL --version || true
162− - name: update cabal index
163− run: |
164− $CABAL v2-update -v
165− - name: install cabal-plan
166− run: |
167− mkdir -p $HOME/.cabal/bin
168− curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
169− echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
170− xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
171− rm -f cabal-plan.xz
172− chmod a+x $HOME/.cabal/bin/cabal-plan
173− cabal-plan --version
174− - name: checkout
175− uses: actions/checkout@v4
176− with:
177− path: source
178− - name: initial cabal.project for sdist
179− run: |
180− touch cabal.project
181− echo "packages: $GITHUB_WORKSPACE/source/uuid-types" >> cabal.project
182− echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project
183− cat cabal.project
184− - name: sdist
185− run: |
186− mkdir -p sdist
187− $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
188− - name: unpack
189− run: |
190− mkdir -p unpacked
191− find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
192− - name: generate cabal.project
193− run: |
194− PKGDIR_uuid_types="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/uuid-types-[0-9.]*')"
195− echo "PKGDIR_uuid_types=${PKGDIR_uuid_types}" >> "$GITHUB_ENV"
196− PKGDIR_uuid="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/uuid-[0-9.]*')"
197− echo "PKGDIR_uuid=${PKGDIR_uuid}" >> "$GITHUB_ENV"
198− rm -f cabal.project cabal.project.local
199− touch cabal.project
200− touch cabal.project.local
201− echo "packages: ${PKGDIR_uuid_types}" >> cabal.project
202− echo "packages: ${PKGDIR_uuid}" >> cabal.project
203− echo "package uuid-types" >> cabal.project
204− echo " ghc-options: -Werror=missing-methods" >> cabal.project
205− echo "package uuid" >> cabal.project
206− echo " ghc-options: -Werror=missing-methods" >> cabal.project
207− cat >> cabal.project <<EOF
208− EOF
209− $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(uuid|uuid-types)$/; }' >> cabal.project.local
210− cat cabal.project
211− cat cabal.project.local
212− - name: dump install plan
213− run: |
214− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
215− cabal-plan
216− - name: restore cache
217− uses: actions/cache/restore@v4
218− with:
219− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
220− path: ~/.cabal/store
221− restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
222− - name: install dependencies
223− run: |
224− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
225− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all
226− - name: build w/o tests
227− run: |
228− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
229− - name: build
230− run: |
231− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
232− - name: tests
233− run: |
234− $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
235− - name: cabal check
236− run: |
237− cd ${PKGDIR_uuid_types} || false
238− ${CABAL} -vnormal check
239− cd ${PKGDIR_uuid} || false
240− ${CABAL} -vnormal check
241− - name: haddock
242− run: |
243− $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
244− - name: unconstrained build
245− run: |
246− rm -f cabal.project.local
247− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
248− - name: prepare for constraint sets
249− run: |
250− rm -f cabal.project.local
251− - name: constraint set random-1.2
252− run: |
253− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all --dry-run
254− cabal-plan topo | sort
255− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all
256− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all
257− - name: save cache
258− if: always()
259− uses: actions/cache/save@v4
260− with:
261− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
262− path: ~/.cabal/store
.gitignore+1−5
@@ -1,3 +1,4 @@
1+
1# Sandboxing
2# Sandboxing
2.cabal-sandbox/
3.cabal-sandbox/
3cabal.sandbox.config
4cabal.sandbox.config
@@ -5,9 +6,4 @@ cabal.sandbox.config
5# Cabal stuff
6# Cabal stuff
6dist/
7dist/
7cabal.config
8cabal.config
8−dist-newstyle/
9−/cabal.project.local
10−.ghc.environment.*
11
9
12−# Emacs
13−*~
.travis.ymlnew file+12
@@ -0,0 +1,12 @@
1+language: haskell
2+ghc:
3+ - 7.10
4+ - 7.8
5+ - 7.6
6+ - 7.4
7+
8+sudo: false
9+install:
10+ - ./travis-scripts/install.sh
11+script:
12+ - ./travis-scripts/build.sh
README.md+1−1
@@ -1,4 +1,4 @@
1−# uuid [![Build Status](https://travis-ci.org/hvr/uuid.svg?branch=master)](https://travis-ci.org/hvr/uuid)
1+# uuid [![Build Status](https://travis-ci.org/aslatter/uuid.svg?branch=master)](https://travis-ci.org/aslatter/uuid)
2
2
3This library is useful for creating, comparing, parsing and printing Universally
3This library is useful for creating, comparing, parsing and printing Universally
4Unique Identifiers. See http://en.wikipedia.org/wiki/UUID for the general idea.
4Unique Identifiers. See http://en.wikipedia.org/wiki/UUID for the general idea.
cabal.bench.projectdeleted−4
@@ -1,4 +0,0 @@
1−-- separate package for benchmarks
2−-- this way we can build criterion
3−packages: uuid-bench
4−benchmarks: True
cabal.haskell-cideleted−7
@@ -1,7 +0,0 @@
1−branches: master
2−-- jobs-selection: any
3−head-hackage: False
4−
5−constraint-set random-1.2
6− ghc: >=7.10
7− constraints: random==1.2.*
cabal.projectdeleted−15
@@ -1,15 +0,0 @@
1−-- see http://cabal.readthedocs.io/en/latest/nix-local-build.html
2−-- for more details
3−
4−packages: uuid-types/
5−packages: uuid/
6−
7−package uuid-types
8− tests: True
9− -- profiling: True
10− -- profiling-detail: toplevel-functions
11−
12−package uuid
13− tests: True
14− -- profiling: True
15− -- profiling-detail: toplevel-functions
gen-ci.shdeleted−5
@@ -1,5 +0,0 @@
1−#!/bin/sh
2−
3−# haskell-ci doesn't know how to regenerate multiple GHA workflows
4−haskell-ci github cabal.project
5−haskell-ci github --project cabal.bench.project -o .github/workflows/haskell-ci-bench.yml --github-action-name Benchmarks
travis-scripts/build.shnew file+27
@@ -0,0 +1,27 @@
1+#!/usr/bin/env sh
2+echo "==========================================="
3+echo "= Building and installing 'uuid-types'... ="
4+echo "==========================================="
5+
6+# We install here because "uuid" is going to need it.
7+(cd "uuid-types" && \
8+ cabal configure --enable-tests && \
9+ cabal build && \
10+ cabal test && \
11+ cabal install) || exit 1
12+
13+echo "========================================="
14+echo "= Installing dependencies for 'uuid'... ="
15+echo "========================================="
16+
17+(cd "uuid" && \
18+ cabal install --dependencies-only --enable-tests) || exit 1
19+
20+echo "======================"
21+echo "= Building 'uuid'... ="
22+echo "======================"
23+
24+(cd "uuid" && \
25+ cabal configure --enable-tests && \
26+ cabal build && \
27+ cabal test) || exit 1
travis-scripts/install.shnew file+13
@@ -0,0 +1,13 @@
1+#!/usr/bin/env sh
2+
3+# We can only pre-install dependencies for the "uuid-types" project
4+# since the "uuid" project depends on "uuid-types". We could use
5+# sandboxing and "add-source", but it seems quite wasteful of
6+# CPU-cycles to compile everything twice for each version of GHC.
7+
8+echo "==============================================="
9+echo "= Installing dependencies for 'uuid-types'... ="
10+echo "==============================================="
11+
12+(cd "uuid-types" && \
13+ cabal install --dependencies-only --enable-tests) || exit 1
uuid-bench/LICENSEdeleted−28
@@ -1,28 +0,0 @@
1−Copyright (c) 2008, Antoine Latter
2−
3−All rights reserved.
4−
5−Redistribution and use in source and binary forms, with or without
6−modification, are permitted provided that the following conditions are
7−met:
8−
9− * Redistributions of source code must retain the above copyright
10−notice, this list of conditions and the following disclaimer.
11− * Redistributions in binary form must reproduce the above copyright
12−notice, this list of conditions and the following disclaimer in the
13−documentation and/or other materials provided with the distribution.
14− * The names of the authors may not be used to endorse or promote
15−products derived from this software without specific prior written
16−permission.
17−
18−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19−"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20−LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21−A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22−OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23−SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
24−TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
25−PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
26−LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
27−NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
28−SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
uuid-bench/src-uuiddeleted−1
@@ -1 +0,0 @@
1−../uuid/src
uuid-bench/src-uuid-typesdeleted−1
@@ -1 +0,0 @@
1−../uuid-types/src
uuid-bench/uuid-bench.cabaldeleted−126
@@ -1,126 +0,0 @@
1−cabal-version: 1.12
2−name: uuid-bench
3−version: 0
4−copyright:
5− (c) 2017-2018 Herbert Valerio Riedel
6− (c) 2008-2014 Antoine Latter
7−
8−author: Antoine Latter
9−maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
10−license: BSD3
11−license-file: LICENSE
12−category: Data
13−build-type: Simple
14−
15−-- Benchmarking with older GHCs is not meaningful
16−tested-with:
17− GHC ==8.6.5
18− || ==8.8.4
19− || ==8.10.7
20− || ==9.0.2
21− || ==9.2.8
22− || ==9.4.8
23− || ==9.6.6
24− || ==9.8.2
25− || ==9.10.1
26−
27−synopsis: UUID benchmarks
28−description:
29− UUID benchmarks.
30− This package is combined uuid and uuid-types, renamed so we do not
31− cause benchmark tools to be build against local package.
32−
33−homepage: https://github.com/haskell-hvr/uuid
34−bug-reports: https://github.com/haskell-hvr/uuid/issues
35−
36−source-repository head
37− type: git
38− location: https://github.com/haskell-hvr/uuid.git
39− subdir: uuid-bench
40−
41−library
42− build-depends:
43− base >=4.12.0.0 && <5
44− , binary >=0.8.6.0 && <0.9
45− , bytestring >=0.10.8.2 && <0.13
46− , cryptohash-md5 >=0.11.100 && <0.12
47− , cryptohash-sha1 >=0.11.100 && <0.12
48− , deepseq >=1.4.4.0 && <1.6
49− , entropy >=0.3.7 && <0.5
50− , hashable >=1.4.4.0 && <1.6
51− , network-info >=0.2 && <0.3
52− , random >=1.2.1.2 && <1.3
53− , template-haskell >=2.14.0.0 && <2.23
54− , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
55− , time >=1.4 && <1.13
56−
57− -- uuid modules
58− exposed-modules:
59− Data.UUID
60− Data.UUID.Util
61− Data.UUID.V3
62− Data.UUID.V4
63− Data.UUID.V5
64−
65− other-modules:
66− Data.UUID.Named
67− Data.Word.Util
68−
69− -- uuid-types modules
70− exposed-modules: Data.UUID.Types
71−
72− -- Exposed for companion projects; *NOT* part of the official API:
73− exposed-modules:
74− Data.UUID.Types.Internal
75− Data.UUID.Types.Internal.Builder
76−
77− default-language: Haskell2010
78− other-extensions:
79− DeriveDataTypeable
80− TypeFamilies
81−
82− ghc-options: -Wall
83− hs-source-dirs: src-uuid-types src-uuid
84−
85−benchmark uuid-types-benchmark
86− type: exitcode-stdio-1.0
87− main-is: uuid-types-benchmark.hs
88− hs-source-dirs: bench
89− default-language: Haskell2010
90− other-extensions: CPP
91− ghc-options: -Wall
92−
93− -- inherited constraints
94− build-depends:
95− base
96− , bytestring
97− , random
98− , uuid-bench
99−
100− -- deps w/o inherited constraints
101− build-depends:
102− containers >=0.5 && <0.8
103− , criterion >=1.5 && <1.7
104− , unordered-containers >=0.2.7 && <0.3
105−
106−benchmark uuid-benchmark
107− type: exitcode-stdio-1.0
108− main-is: uuid-benchmark.hs
109− hs-source-dirs: bench
110− default-language: Haskell2010
111− default-extensions:
112− CPP
113− DeriveDataTypeable
114−
115− ghc-options: -Wall -fno-warn-orphans
116−
117− -- inherited constraints
118− build-depends:
119− base
120− , random
121− , uuid-bench
122−
123− -- deps w/o inherited constraints
124− build-depends:
125− criterion >=1.5 && <1.7
126− , mersenne-random-pure64 >=0.2 && <0.3
uuid-types/CHANGESnew file+3
@@ -0,0 +1,3 @@
1+1.0.0
2+
3+- Initial split from "uuid-1.3.8"
CONTRIBUTORS → uuid-types/CONTRIBUTORSrenamed−2
@@ -11,5 +11,3 @@ davean
11Francesco Mazzoli
11Francesco Mazzoli
12Michael Snoyman
12Michael Snoyman
13Bardur Arantsson
13Bardur Arantsson
14−Timo von Holtz
15−Oleg Grenrus
uuid-types/ChangeLog.mddeleted−31
@@ -1,31 +0,0 @@
1−## 1.0.6 (2023-04-16)
2−
3−- Support GHC-8.6.5..GHC-9.10.1
4−
5−## 1.0.5 (2021-05-03)
6−
7−- Add (Template Haskell) `Lift UUID` instance
8−
9−## 1.0.4.0
10−
11−- Declare `Data.UUID.Types` module "`Trustworthy`" with respect to SafeHaskell.
12−- Use more compact heap object representation which saves 16 bytes on 64bit platforms.
13−- Add `toWords64`/`fromWords64` functions
14−- Drop support for GHC < 7.
15−- Add support for `random-1.2`, i.e. idiomatic `Random` and added `Uniform` instances.
16−
17−## 1.0.3
18−
19−- Bump package dependencies.
20−
21−## 1.0.2
22−
23−- Add `toText`/`fromText` functions.
24−
25−## 1.0.1
26−
27−- Update dependencies in tests and benchmarks.
28−
29−## 1.0.0
30−
31−- Initial split from "`uuid-1.3.8`" package.
uuid-types/Data/UUID/Types.hsnew file+37
@@ -0,0 +1,37 @@
1+{- |
2+Module : Data.UUID.Types
3+Copyright : (c) 2008,2012 Antoine Latter
4+
5+License : BSD-style
6+
7+Maintainer : aslatter@gmail.com
8+Stability : experimental
9+Portability : portable
10+
11+
12+This library is useful for comparing, parsing and
13+printing Universally Unique Identifiers.
14+See <http://en.wikipedia.org/wiki/UUID> for the general idea.
15+See <http://tools.ietf.org/html/rfc4122> for the specification.
16+
17+-}
18+module Data.UUID.Types(UUID
19+ ,toString
20+ ,fromString
21+ ,toASCIIBytes
22+ ,fromASCIIBytes
23+ ,toLazyASCIIBytes
24+ ,fromLazyASCIIBytes
25+ ,toByteString
26+ ,fromByteString
27+ ,toWords
28+ ,fromWords
29+ ,null
30+ ,nil
31+ ) where
32+
33+import Prelude () -- we need to hide Prelude.null
34+import Data.UUID.Types.Internal
35+
36+-- Everything is really implemented in Data.UUID.Types.Internal, but I
37+-- don't want to export the constructors out of the package.
uuid-types/src/Data/UUID/Types/Internal.hs → uuid-types/Data/UUID/Types/Internal.hsrenamed+166−204
@@ -1,86 +1,84 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DeriveDataTypeable #-}
1+{-# LANGUAGE DeriveDataTypeable, TypeFamilies, CPP #-}
3−{-# LANGUAGE TypeFamilies #-}
4−{-# LANGUAGE ViewPatterns #-}
5−{-# LANGUAGE Unsafe #-}
6−{-# LANGUAGE DeriveLift #-}
7−{-# LANGUAGE StandaloneDeriving #-}
8{-# OPTIONS_HADDOCK hide #-}
2{-# OPTIONS_HADDOCK hide #-}
9
3
10-- |
4-- |
11-- Module : Data.UUID.Types.Internal
5-- Module : Data.UUID.Types.Internal
12−-- Copyright : (c) 2017-2018 Herbert Valerio Riedel
13−-- (c) 2008-2009, 2012 Antoine Latter
6+-- Copyright : (c) 2008-2009, 2012 Antoine Latter
14-- (c) 2009 Mark Lentczner
7-- (c) 2009 Mark Lentczner
15--
8--
16-- License : BSD-style
9-- License : BSD-style
17--
10--
18−-- Maintainer : hvr@gnu.org
11+-- Maintainer : aslatter@gmail.com
12+-- Stability : experimental
19-- Portability : portable
13-- Portability : portable
20
14
21module Data.UUID.Types.Internal
15module Data.UUID.Types.Internal
22− ( UUID(..)
16+ (UUID(..)
23− , null
17+ ,null
24− , nil
18+ ,nil
25− , fromByteString
19+ ,fromByteString
26− , toByteString
20+ ,toByteString
27− , fromString
21+ ,fromString
28− , toString
22+ ,toString
29− , fromText
30− , toText
31− , fromWords
23+ ,fromWords
32− , toWords
24+ ,toWords
33− , fromWords64
34− , toWords64
35− , toList
25+ ,toList
36− , buildFromBytes
26+ ,buildFromBytes
37− , buildFromWords
27+ ,buildFromWords
38− , fromASCIIBytes
28+ ,fromASCIIBytes
39− , toASCIIBytes
29+ ,toASCIIBytes
40− , fromLazyASCIIBytes
30+ ,fromLazyASCIIBytes
41− , toLazyASCIIBytes
31+ ,toLazyASCIIBytes
42− , UnpackedUUID(..)
32+ ,UnpackedUUID(..)
43− , pack
33+ ,pack
44− , unpack
34+ ,unpack
45 ) where
35 ) where
46
36
47−import Prelude hiding (null)
37+import Prelude hiding (null)
48−
38+
39+import Control.Applicative ((<*>))
49−import Control.DeepSeq (NFData (..))
40+import Control.DeepSeq (NFData(..))
50−import Control.Monad (guard, liftM2)
41+import Control.Monad (liftM4, guard)
42+import Data.Functor ((<$>))
43+import Data.Char
51−import Data.Bits
44+import Data.Bits
52−import Data.Char
53−import Data.Data
54−import Data.Hashable
45+import Data.Hashable
55−import Data.List (elemIndices)
46+import Data.List (elemIndices)
56−import Foreign.Ptr (Ptr)
47+import Foreign.Ptr (Ptr)
57−
48+
58−import Foreign.Storable
49+#if MIN_VERSION_base(4,0,0)
59−
50+import Data.Data
51+#else
60−import Data.Binary
52+import Data.Generics.Basics
53+#endif
54+
55+import Foreign.Storable
56+
61−import Data.Binary.Get
57+import Data.Binary
62−import Data.Binary.Put
58+import Data.Binary.Put
59+import Data.Binary.Get
63−import qualified Data.ByteString as B
60+import qualified Data.ByteString as B
64−import qualified Data.ByteString.Internal as BI
61+import qualified Data.ByteString.Internal as BI
65−import qualified Data.ByteString.Lazy as BL
62+import qualified Data.ByteString.Lazy as BL
66−import qualified Data.ByteString.Unsafe as BU
63+import qualified Data.ByteString.Unsafe as BU
67−import Data.Text (Text)
64+
68−import qualified Data.Text.Encoding as T
69−
70−import Data.UUID.Types.Internal.Builder
65+import Data.UUID.Types.Internal.Builder
71−
66+
72−import System.Random (Random (..), uniform)
67+import System.Random
73−import System.Random.Stateful (Uniform (..), uniformWord64)
68+
74−
69+
75−import Language.Haskell.TH.Syntax (Lift)
70+-- |The UUID type. A 'Random' instance is provided which produces
76−
71+-- version 4 UUIDs as specified in RFC 4122. The 'Storable' and
77−-- | Type representing <https://en.wikipedia.org/wiki/UUID Universally Unique Identifiers (UUID)> as specified in
72+-- 'Binary' instances are compatible with RFC 4122, storing the fields
78−-- <http://tools.ietf.org/html/rfc4122 RFC 4122>.
73+-- in network order as 16 bytes.
79−data UUID = UUID {-# UNPACK #-} !Word64 {-# UNPACK #-} !Word64
74+data UUID
75+ = UUID
76+ {-# UNPACK #-} !Word32
77+ {-# UNPACK #-} !Word32
78+ {-# UNPACK #-} !Word32
79+ {-# UNPACK #-} !Word32
80− deriving (Eq, Ord)
80+ deriving (Eq, Ord, Typeable)
81{-
81{-
82− Prior to uuid-types-1.0.4:
83− !Word32 !Word32 !Word32 !Word32
84 Other representations that we tried are:
82 Other representations that we tried are:
85 Mimic V1 structure: !Word32 !Word16 !Word16 !Word16
83 Mimic V1 structure: !Word32 !Word16 !Word16 !Word16
86 !Word8 !Word8 !Word8 !Word8 !Word8 !Word8
84 !Word8 !Word8 !Word8 !Word8 !Word8 !Word8
@@ -92,75 +90,40 @@ data UUID = UUID {-# UNPACK #-} !Word64 {-# UNPACK #-} !Word64
92 None was as fast, overall, as the representation used here.
90 None was as fast, overall, as the representation used here.
93-}
91-}
94
92
95−-- | Convert a 'UUID' into a sequence of 'Word32' values.
93+-- | Covert a 'UUID' into a sequence of 'Word32' values.
96-- Useful for when you need to serialize a UUID and
94-- Useful for when you need to serialize a UUID and
97-- neither 'Storable' nor 'Binary' are appropriate.
95-- neither 'Storable' nor 'Binary' are appropriate.
98−--
96+-- Introduced in version 1.2.2.
99−-- >>> toWords <$> fromString "550e8400-e29b-41d4-a716-446655440000"
100−-- Just (1427014656,3801825748,2803254374,1430519808)
101−--
102−-- See also 'toWords64'.
103−--
104−-- /Since: @uuid-1.2.2@/
105−--
106−-- @since 1.0.0
107toWords :: UUID -> (Word32, Word32, Word32, Word32)
97toWords :: UUID -> (Word32, Word32, Word32, Word32)
108−toWords (UUID w12 w34) = (w1, w2, w3, w4)
98+toWords (UUID w1 w2 w3 w4) = (w1, w2, w3, w4)
109− where
110− w1 = fromIntegral (w12 `unsafeShiftR` 32)
111− w2 = fromIntegral w12
112− w3 = fromIntegral (w34 `unsafeShiftR` 32)
113− w4 = fromIntegral w34
114
99
115-- | Create a 'UUID' from a sequence of 'Word32'. The
100-- | Create a 'UUID' from a sequence of 'Word32'. The
116−-- inverse of 'toWords'. Useful when you need a total
101+-- opposite of 'toWords'. Useful when you need a total
117-- function for constructing 'UUID' values.
102-- function for constructing 'UUID' values.
118−--
103+-- Introduced in version 1.2.2.
119−-- See also 'fromWords64'.
120−--
121−-- /Since: @uuid-1.2.2@/
122−--
123−-- @since 1.0.0
124fromWords :: Word32 -> Word32 -> Word32 -> Word32 -> UUID
104fromWords :: Word32 -> Word32 -> Word32 -> Word32 -> UUID
125−fromWords w1 w2 w3 w4 = UUID (w32to64 w1 w2) (w32to64 w3 w4)
105+fromWords = UUID
126−
127−-- | Convert a 'UUID' into a pair of 'Word64's.
128−--
129−-- >>> toWords64 <$> fromString "550e8400-e29b-41d4-a716-446655440000"
130−-- Just (6128981282234515924,12039885860129472512)
131−--
132−-- See also 'toWords'.
133−--
134−-- @since 1.0.4
135−toWords64 :: UUID -> (Word64, Word64)
136−toWords64 (UUID w12 w34) = (w12,w34)
137−
138−-- | Create a 'UUID' from a pair of 'Word64's.
139−--
140−-- Inverse of 'toWords64'. See also 'fromWords'.
141−--
142−-- @since 1.0.4
143−fromWords64 :: Word64 -> Word64 -> UUID
144−fromWords64 = UUID
145
106
146data UnpackedUUID =
107data UnpackedUUID =
147 UnpackedUUID {
108 UnpackedUUID {
148− time_low :: Word32 -- 0-3
109+ time_low :: Word32 -- 0-3
149− , time_mid :: Word16 -- 4-5
110+ , time_mid :: Word16 -- 4-5
150 , time_hi_and_version :: Word16 -- 6-7
111 , time_hi_and_version :: Word16 -- 6-7
151− , clock_seq_hi_res :: Word8 -- 8
112+ , clock_seq_hi_res :: Word8 -- 8
152− , clock_seq_low :: Word8 -- 9
113+ , clock_seq_low :: Word8 -- 9
153− , node_0 :: Word8
114+ , node_0 :: Word8
154− , node_1 :: Word8
115+ , node_1 :: Word8
155− , node_2 :: Word8
116+ , node_2 :: Word8
156− , node_3 :: Word8
117+ , node_3 :: Word8
157− , node_4 :: Word8
118+ , node_4 :: Word8
158− , node_5 :: Word8
119+ , node_5 :: Word8
159 }
120 }
160 deriving (Read, Show, Eq, Ord)
121 deriving (Read, Show, Eq, Ord)
161
122
162unpack :: UUID -> UnpackedUUID
123unpack :: UUID -> UnpackedUUID
163−unpack (UUID w0 w1) = build /-/ w0 /-/ w1
124+unpack (UUID w0 w1 w2 w3) =
125+ build /-/ w0 /-/ w1 /-/ w2 /-/ w3
126+
164 where
127 where
165 build x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF =
128 build x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF =
166 UnpackedUUID {
129 UnpackedUUID {
@@ -195,26 +158,23 @@ pack unpacked =
195
158
196-- |Build a Word32 from four Word8 values, presented in big-endian order
159-- |Build a Word32 from four Word8 values, presented in big-endian order
197word :: Word8 -> Word8 -> Word8 -> Word8 -> Word32
160word :: Word8 -> Word8 -> Word8 -> Word8 -> Word32
198−word a b c d = (fromIntegral a `unsafeShiftL` 24)
161+word a b c d = (fromIntegral a `shiftL` 24)
199− .|. (fromIntegral b `unsafeShiftL` 16)
162+ .|. (fromIntegral b `shiftL` 16)
200− .|. (fromIntegral c `unsafeShiftL` 8)
163+ .|. (fromIntegral c `shiftL` 8)
201− .|. (fromIntegral d )
164+ .|. (fromIntegral d )
202
165
203−-- |Extract a Word8 from a Word64. Bytes, high to low, are numbered from 7 to 0,
166+-- |Extract a Word8 from a Word32. Bytes, high to low, are numbered from 3 to 0,
204−byte :: Int -> Word64 -> Word8
167+byte :: Int -> Word32 -> Word8
205byte i w = fromIntegral (w `shiftR` (i * 8))
168byte i w = fromIntegral (w `shiftR` (i * 8))
206
169
207-- |Build a Word16 from two Word8 values, presented in big-endian order.
170-- |Build a Word16 from two Word8 values, presented in big-endian order.
208w8to16 :: Word8 -> Word8 -> Word16
171w8to16 :: Word8 -> Word8 -> Word16
209w8to16 w0s w1s =
172w8to16 w0s w1s =
210− (w0 `unsafeShiftL` 8) .|. w1
173+ (w0 `shiftL` 8) .|. w1
211 where
174 where
212 w0 = fromIntegral w0s
175 w0 = fromIntegral w0s
213 w1 = fromIntegral w1s
176 w1 = fromIntegral w1s
214
177
215−-- | Construct 'Word64' from low/high 'Word32's
216−w32to64 :: Word32 -> Word32 -> Word64
217−w32to64 w0 w1 = (fromIntegral w0 `unsafeShiftL` 32) .|. (fromIntegral w1)
218
178
219-- |Make a UUID from sixteen Word8 values
179-- |Make a UUID from sixteen Word8 values
220makeFromBytes :: Word8 -> Word8 -> Word8 -> Word8
180makeFromBytes :: Word8 -> Word8 -> Word8 -> Word8
@@ -223,12 +183,16 @@ makeFromBytes :: Word8 -> Word8 -> Word8 -> Word8
223 -> Word8 -> Word8 -> Word8 -> Word8
183 -> Word8 -> Word8 -> Word8 -> Word8
224 -> UUID
184 -> UUID
225makeFromBytes b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf
185makeFromBytes b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf
226− = fromWords w0 w1 w2 w3
186+ = UUID w0 w1 w2 w3
227 where w0 = word b0 b1 b2 b3
187 where w0 = word b0 b1 b2 b3
228 w1 = word b4 b5 b6 b7
188 w1 = word b4 b5 b6 b7
229 w2 = word b8 b9 ba bb
189 w2 = word b8 b9 ba bb
230 w3 = word bc bd be bf
190 w3 = word bc bd be bf
231
191
192+-- |Make a UUID from four Word32 values
193+makeFromWords :: Word32 -> Word32 -> Word32 -> Word32 -> UUID
194+makeFromWords = UUID
195+
232-- |A Builder for constructing a UUID of a given version.
196-- |A Builder for constructing a UUID of a given version.
233buildFromBytes :: Word8
197buildFromBytes :: Word8
234 -> Word8 -> Word8 -> Word8 -> Word8
198 -> Word8 -> Word8 -> Word8 -> Word8
@@ -241,20 +205,20 @@ buildFromBytes v b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf =
241 where b6' = b6 .&. 0x0f .|. (v `shiftL` 4)
205 where b6' = b6 .&. 0x0f .|. (v `shiftL` 4)
242 b8' = b8 .&. 0x3f .|. 0x80
206 b8' = b8 .&. 0x3f .|. 0x80
243
207
244−-- |Build a UUID of a given version from 'Word32' values.
208+-- |Build a UUID of a given version from Word32 values.
245buildFromWords :: Word8 -> Word32 -> Word32 -> Word32 -> Word32 -> UUID
209buildFromWords :: Word8 -> Word32 -> Word32 -> Word32 -> Word32 -> UUID
246−buildFromWords v w0 w1 w2 w3 = fromWords w0 w1' w2' w3
210+buildFromWords v w0 w1 w2 w3 = makeFromWords w0 w1' w2' w3
247 where w1' = w1 .&. 0xffff0fff .|. ((fromIntegral v) `shiftL` 12)
211 where w1' = w1 .&. 0xffff0fff .|. ((fromIntegral v) `shiftL` 12)
248 w2' = w2 .&. 0x3fffffff .|. 0x80000000
212 w2' = w2 .&. 0x3fffffff .|. 0x80000000
249
213
250
214
251-- |Return the bytes that make up the UUID
215-- |Return the bytes that make up the UUID
252toList :: UUID -> [Word8]
216toList :: UUID -> [Word8]
253−toList (UUID w0 w1) =
217+toList (UUID w0 w1 w2 w3) =
254− [byte 7 w0, byte 6 w0, byte 5 w0, byte 4 w0,
218+ [byte 3 w0, byte 2 w0, byte 1 w0, byte 0 w0,
255− byte 3 w0, byte 2 w0, byte 1 w0, byte 0 w0,
219+ byte 3 w1, byte 2 w1, byte 1 w1, byte 0 w1,
256− byte 7 w1, byte 6 w1, byte 5 w1, byte 4 w1,
220+ byte 3 w2, byte 2 w2, byte 1 w2, byte 0 w2,
257− byte 3 w1, byte 2 w1, byte 1 w1, byte 0 w1]
221+ byte 3 w3, byte 2 w3, byte 1 w3, byte 0 w3]
258
222
259-- |Construct a UUID from a list of Word8. Returns Nothing if the list isn't
223-- |Construct a UUID from a list of Word8. Returns Nothing if the list isn't
260-- exactly sixteen bytes long
224-- exactly sixteen bytes long
@@ -275,10 +239,10 @@ null = (== nil)
275 -- null (UUID 0 0 0 0) = True
239 -- null (UUID 0 0 0 0) = True
276 -- null _ = False
240 -- null _ = False
277
241
278−-- |The 'nil' UUID, as defined in <http://tools.ietf.org/html/rfc4122 RFC 4122>.
242+-- |The nil UUID, as defined in RFC 4122.
279−-- It is a UUID of all zeros. @'null' u@ /iff/ @'u' == 'nil'@.
243+-- It is a UUID of all zeros. @'null' u@ iff @'u' == 'nil'@.
280nil :: UUID
244nil :: UUID
281−nil = UUID 0 0
245+nil = UUID 0 0 0 0
282
246
283-- |Extract a UUID from a 'ByteString' in network byte order.
247-- |Extract a UUID from a 'ByteString' in network byte order.
284-- The argument must be 16 bytes long, otherwise 'Nothing' is returned.
248-- The argument must be 16 bytes long, otherwise 'Nothing' is returned.
@@ -286,8 +250,6 @@ fromByteString :: BL.ByteString -> Maybe UUID
286fromByteString = fromList . BL.unpack
250fromByteString = fromList . BL.unpack
287
251
288-- |Encode a UUID into a 'ByteString' in network order.
252-- |Encode a UUID into a 'ByteString' in network order.
289−--
290−-- This uses the same encoding as the 'Binary' instance.
291toByteString :: UUID -> BL.ByteString
253toByteString :: UUID -> BL.ByteString
292toByteString = BL.pack . toList
254toByteString = BL.pack . toList
293
255
@@ -295,8 +257,9 @@ toByteString = BL.pack . toList
295-- The hyphens may not be omitted.
257-- The hyphens may not be omitted.
296-- Example:
258-- Example:
297--
259--
260+-- @
298−-- >>> fromString "c2cc10e1-57d6-4b6f-9899-38d972112d8c"
261+-- fromString \"c2cc10e1-57d6-4b6f-9899-38d972112d8c\"
299−-- Just c2cc10e1-57d6-4b6f-9899-38d972112d8c
262+-- @
300--
263--
301-- Hex digits may be upper or lower-case.
264-- Hex digits may be upper or lower-case.
302fromString :: String -> Maybe UUID
265fromString :: String -> Maybe UUID
@@ -311,7 +274,7 @@ fromString' s0 = do
311 (w2, s3) <- hexWord s2
274 (w2, s3) <- hexWord s2
312 (w3, s4) <- hexWord s3
275 (w3, s4) <- hexWord s3
313 if s4 /= "" then Nothing
276 if s4 /= "" then Nothing
314− else Just $ fromWords w0 w1 w2 w3
277+ else Just $ UUID w0 w1 w2 w3
315 where hexWord :: String -> Maybe (Word32, String)
278 where hexWord :: String -> Maybe (Word32, String)
316 hexWord s = Just (0, s) >>= hexByte >>= hexByte
279 hexWord s = Just (0, s) >>= hexByte >>= hexByte
317 >>= hexByte >>= hexByte
280 >>= hexByte >>= hexByte
@@ -328,39 +291,21 @@ fromString' s0 = do
328-- | Convert a UUID into a hypenated string using lower-case letters.
291-- | Convert a UUID into a hypenated string using lower-case letters.
329-- Example:
292-- Example:
330--
293--
294+-- @
331−-- >>> toString <$> fromString "550e8400-e29b-41d4-a716-446655440000"
295+-- toString \<$\> fromString \"550e8400-e29b-41d4-a716-446655440000\"
332−-- Just "550e8400-e29b-41d4-a716-446655440000"
296+-- @
333−--
334−--
335toString :: UUID -> String
297toString :: UUID -> String
336−toString uuid = hexw0 w0 $ hexw1 w1 ""
298+toString (UUID w0 w1 w2 w3) = hexw w0 $ hexw' w1 $ hexw' w2 $ hexw w3 ""
337− where hexw0 :: Word64 -> String -> String
299+ where hexw :: Word32 -> String -> String
338− hexw0 w s = hexn w 60 : hexn w 56 : hexn w 52 : hexn w 48
339− : hexn w 44 : hexn w 40 : hexn w 36 : hexn w 32
340− : '-' : hexn w 28 : hexn w 24 : hexn w 20 : hexn w 16
300+ hexw w s = hexn w 28 : hexn w 24 : hexn w 20 : hexn w 16
341− : '-' : hexn w 12 : hexn w 8 : hexn w 4 : hexn w 0
301+ : hexn w 12 : hexn w 8 : hexn w 4 : hexn w 0 : s
342− : s
343−
344− hexw1 :: Word64 -> String -> String
345− hexw1 w s = '-' : hexn w 60 : hexn w 56 : hexn w 52 : hexn w 48
346− : '-' : hexn w 44 : hexn w 40 : hexn w 36 : hexn w 32
347− : hexn w 28 : hexn w 24 : hexn w 20 : hexn w 16
348− : hexn w 12 : hexn w 8 : hexn w 4 : hexn w 0
349− : s
350−
351− hexn :: Word64 -> Int -> Char
352− hexn w r = intToDigit $ fromIntegral ((w `shiftR` r) .&. 0xf)
353
302
354− (w0,w1) = toWords64 uuid
303+ hexw' :: Word32 -> String -> String
355−
304+ hexw' w s = '-' : hexn w 28 : hexn w 24 : hexn w 20 : hexn w 16
356−-- | If the passed in `Text` can be parsed as an ASCII representation of
305+ : '-' : hexn w 12 : hexn w 8 : hexn w 4 : hexn w 0 : s
357−-- a `UUID`, it will be. The hyphens may not be omitted.
358−fromText :: Text -> Maybe UUID
359−fromText = fromASCIIBytes . T.encodeUtf8
360
306
361−-- | Convert a UUID into a hyphentated string using lower-case letters.
307+ hexn :: Word32 -> Int -> Char
362−toText :: UUID -> Text
308+ hexn w r = intToDigit $ fromIntegral ((w `shiftR` r) .&. 0xf)
363−toText = T.decodeLatin1 . toASCIIBytes
364
309
365-- | Convert a UUID into a hyphentated string using lower-case letters, packed
310-- | Convert a UUID into a hyphentated string using lower-case letters, packed
366-- as ASCII bytes into `B.ByteString`.
311-- as ASCII bytes into `B.ByteString`.
@@ -455,30 +400,49 @@ fromASCIIBytes bs = do
455-- | Similar to `toASCIIBytes` except we produce a lazy `BL.ByteString`.
400-- | Similar to `toASCIIBytes` except we produce a lazy `BL.ByteString`.
456toLazyASCIIBytes :: UUID -> BL.ByteString
401toLazyASCIIBytes :: UUID -> BL.ByteString
457toLazyASCIIBytes =
402toLazyASCIIBytes =
403+#if MIN_VERSION_bytestring(0,10,0)
458 BL.fromStrict
404 BL.fromStrict
405+#else
406+ BL.fromChunks . return
407+#endif
459 . toASCIIBytes
408 . toASCIIBytes
460
409
461-- | Similar to `fromASCIIBytes` except parses from a lazy `BL.ByteString`.
410-- | Similar to `fromASCIIBytes` except parses from a lazy `BL.ByteString`.
462fromLazyASCIIBytes :: BL.ByteString -> Maybe UUID
411fromLazyASCIIBytes :: BL.ByteString -> Maybe UUID
463fromLazyASCIIBytes bs =
412fromLazyASCIIBytes bs =
464− if BL.length bs == 36 then fromASCIIBytes (BL.toStrict bs) else Nothing
413+ if BL.length bs == 36 then fromASCIIBytes (
414+#if MIN_VERSION_bytestring(0,10,0)
415+ BL.toStrict bs
416+#else
417+ B.concat $ BL.toChunks bs
418+#endif
419+ ) else Nothing
465
420
466--
421--
467-- Class Instances
422-- Class Instances
468--
423--
469
424
470−-- | This 'Random' instance produces __insecure__ version 4 UUIDs as
471−-- specified in <http://tools.ietf.org/html/rfc4122 RFC 4122>.
472instance Random UUID where
425instance Random UUID where
473− random = uniform
426+ random g = (fromGenNext w0 w1 w2 w3 w4, g4)
427+ where (w0, g0) = next g
428+ (w1, g1) = next g0
429+ (w2, g2) = next g1
430+ (w3, g3) = next g2
431+ (w4, g4) = next g3
474 randomR _ = random -- range is ignored
432 randomR _ = random -- range is ignored
475
433
476−-- @since 1.0.4
434+-- |Build a UUID from the results of five calls to next on a StdGen.
477−instance Uniform UUID where
435+-- While next on StdGet returns an Int, it doesn't provide 32 bits of
478− uniformM gen = do
436+-- randomness. This code relies on at last 28 bits of randomness in the
479− w0 <- uniformWord64 gen
437+-- and optimizes its use so as to make only five random values, not six.
480− w1 <- uniformWord64 gen
438+fromGenNext :: Int -> Int -> Int -> Int -> Int -> UUID
439+fromGenNext w0 w1 w2 w3 w4 =
481− pure $ buildFromBytes 4 /-/ w0 /-/ w1
440+ buildFromBytes 4 /-/ (ThreeByte w0)
441+ /-/ (ThreeByte w1)
442+ /-/ w2 -- use all 4 bytes because we know the version
443+ -- field will "cover" the upper, non-random bits
444+ /-/ (ThreeByte w3)
445+ /-/ (ThreeByte w4)
482
446
483-- |A ByteSource to extract only three bytes from an Int, since next on StdGet
447-- |A ByteSource to extract only three bytes from an Int, since next on StdGet
484-- only returns 31 bits of randomness.
448-- only returns 31 bits of randomness.
@@ -486,29 +450,24 @@ type instance ByteSink ThreeByte g = Takes3Bytes g
486newtype ThreeByte = ThreeByte Int
450newtype ThreeByte = ThreeByte Int
487instance ByteSource ThreeByte where
451instance ByteSource ThreeByte where
488 f /-/ (ThreeByte w) = f b1 b2 b3
452 f /-/ (ThreeByte w) = f b1 b2 b3
489− where b1 = fromIntegral (w `unsafeShiftR` 16)
453+ where b1 = fromIntegral (w `shiftR` 16)
490− b2 = fromIntegral (w `unsafeShiftR` 8)
454+ b2 = fromIntegral (w `shiftR` 8)
491 b3 = fromIntegral w
455 b3 = fromIntegral w
492
456
493instance NFData UUID where
457instance NFData UUID where
494− rnf = flip seq ()
458+ rnf = rnf . toWords
495
459
496instance Hashable UUID where
460instance Hashable UUID where
497− hash (toWords -> (w0,w1,w2,w3)) =
461+ hash (UUID w0 w1 w2 w3) =
498 hash w0 `hashWithSalt` w1
462 hash w0 `hashWithSalt` w1
499 `hashWithSalt` w2
463 `hashWithSalt` w2
500 `hashWithSalt` w3
464 `hashWithSalt` w3
501− hashWithSalt s (toWords -> (w0,w1,w2,w3)) =
465+ hashWithSalt s (UUID w0 w1 w2 w3) =
502 s `hashWithSalt` w0
466 s `hashWithSalt` w0
503 `hashWithSalt` w1
467 `hashWithSalt` w1
504 `hashWithSalt` w2
468 `hashWithSalt` w2
505 `hashWithSalt` w3
469 `hashWithSalt` w3
506
470
507−-- | Pretty prints a 'UUID' (without quotation marks). See also 'toString'.
508−--
509−-- >>> show nil
510−-- "00000000-0000-0000-0000-000000000000"
511−--
512instance Show UUID where
471instance Show UUID where
513 show = toString
472 show = toString
514
473
@@ -519,7 +478,7 @@ instance Read UUID where
519 Nothing -> []
478 Nothing -> []
520 Just u -> [(u,drop 36 noSpaces)]
479 Just u -> [(u,drop 36 noSpaces)]
521
480
522−-- | This 'Storable' instance uses the memory layout as described in <http://tools.ietf.org/html/rfc4122 RFC 4122>, but in contrast to the 'Binary' instance, __the fields are stored in host byte order__.
481+
523instance Storable UUID where
482instance Storable UUID where
524 sizeOf _ = 16
483 sizeOf _ = 16
525 alignment _ = 4
484 alignment _ = 4
@@ -556,10 +515,10 @@ instance Storable UUID where
556 pokeByteOff p (off+14) x9
515 pokeByteOff p (off+14) x9
557 pokeByteOff p (off+15) x10
516 pokeByteOff p (off+15) x10
558
517
559−-- | This 'Binary' instance is compatible with <http://tools.ietf.org/html/rfc4122 RFC 4122>, storing the fields in network order as 16 bytes.
560instance Binary UUID where
518instance Binary UUID where
561− put (UUID w0 w1) = putWord64be w0 >> putWord64be w1
519+ put (UUID w0 w1 w2 w3) =
562− get = liftM2 UUID getWord64be getWord64be
520+ putWord32be w0 >> putWord32be w1 >> putWord32be w2 >> putWord32be w3
521+ get = liftM4 UUID getWord32be getWord32be getWord32be getWord32be
563
522
564
523
565-- My goal with this instance was to make it work just enough to do what
524-- My goal with this instance was to make it work just enough to do what
@@ -572,4 +531,7 @@ instance Data UUID where
572uuidType :: DataType
531uuidType :: DataType
573uuidType = mkNoRepType "Data.UUID.Types.UUID"
532uuidType = mkNoRepType "Data.UUID.Types.UUID"
574
533
575−deriving instance Lift UUID
534+#if !(MIN_VERSION_base(4,2,0))
535+mkNoRepType :: String -> DataType
536+mkNoRepType = mkNorepType
537+#endif
uuid-types/src/Data/UUID/Types/Internal/Builder.hs → uuid-types/Data/UUID/Types/Internal/Builder.hsrenamed+1−16
@@ -1,9 +1,7 @@
1{-# LANGUAGE TypeFamilies #-}
1{-# LANGUAGE TypeFamilies #-}
2−{-# LANGUAGE Unsafe #-}
3−
4{-# OPTIONS_HADDOCK hide #-}
2{-# OPTIONS_HADDOCK hide #-}
5
3
6−-- | Module : Data.UUID.Types.Internal.Builder
4+-- Module : Data.UUID.Types.Internal.Builder
7-- Copyright : (c) 2009 Mark Lentczner
5-- Copyright : (c) 2009 Mark Lentczner
8--
6--
9-- License : BSD-style
7-- License : BSD-style
@@ -49,7 +47,6 @@ type Takes1Byte g = Word8 -> g
49type Takes2Bytes g = Word8 -> Word8 -> g
47type Takes2Bytes g = Word8 -> Word8 -> g
50type Takes3Bytes g = Word8 -> Word8 -> Word8 -> g
48type Takes3Bytes g = Word8 -> Word8 -> Word8 -> g
51type Takes4Bytes g = Word8 -> Word8 -> Word8 -> Word8 -> g
49type Takes4Bytes g = Word8 -> Word8 -> Word8 -> Word8 -> g
52−type Takes8Bytes g = Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> g
53
50
54-- | Type of function that a given ByteSource needs.
51-- | Type of function that a given ByteSource needs.
55-- This function must take as many Word8 arguments as the ByteSource provides
52-- This function must take as many Word8 arguments as the ByteSource provides
@@ -57,7 +54,6 @@ type family ByteSink w g
57type instance ByteSink Word8 g = Takes1Byte g
54type instance ByteSink Word8 g = Takes1Byte g
58type instance ByteSink Word16 g = Takes2Bytes g
55type instance ByteSink Word16 g = Takes2Bytes g
59type instance ByteSink Word32 g = Takes4Bytes g
56type instance ByteSink Word32 g = Takes4Bytes g
60−type instance ByteSink Word64 g = Takes8Bytes g
61type instance ByteSink Int g = Takes4Bytes g
57type instance ByteSink Int g = Takes4Bytes g
62
58
63
59
@@ -85,17 +81,6 @@ instance ByteSource Word32 where
85 b3 = fromIntegral (w `shiftR` 8)
81 b3 = fromIntegral (w `shiftR` 8)
86 b4 = fromIntegral w
82 b4 = fromIntegral w
87
83
88−instance ByteSource Word64 where
89− f /-/ w = f b1 b2 b3 b4 b5 b6 b7 b8
90− where b1 = fromIntegral (w `shiftR` 56)
91− b2 = fromIntegral (w `shiftR` 48)
92− b3 = fromIntegral (w `shiftR` 40)
93− b4 = fromIntegral (w `shiftR` 32)
94− b5 = fromIntegral (w `shiftR` 24)
95− b6 = fromIntegral (w `shiftR` 16)
96− b7 = fromIntegral (w `shiftR` 8)
97− b8 = fromIntegral w
98−
99instance ByteSource Int where
84instance ByteSource Int where
100 f /-/ w = f b1 b2 b3 b4
85 f /-/ w = f b1 b2 b3 b4
101 where b1 = fromIntegral (w `shiftR` 24)
86 where b1 = fromIntegral (w `shiftR` 24)
uuid-types/cabal.projectdeleted−1
@@ -1 +0,0 @@
1−packages: .
uuid-types/src/Data/UUID/Types.hsdeleted−47
@@ -1,47 +0,0 @@
1−{-# LANGUAGE Trustworthy #-}
2−
3−{- |
4−Module : Data.UUID.Types
5−Copyright : (c) 2017-2018 Herbert Valerio Riedel
6− (c) 2008,2012 Antoine Latter
7−
8−License : BSD-style
9−
10−Maintainer : hvr@gnu.org
11−Portability : portable
12−
13−This library is useful for comparing, parsing and
14−printing <http://en.wikipedia.org/wiki/UUID Universally Unique Identifiers (UUID)>.
15−See <http://tools.ietf.org/html/rfc4122 RFC 4122> for the specification.
16−
17−-}
18−module Data.UUID.Types
19− ( -- * The 'UUID' Type
20− UUID
21− -- * Nil UUID
22− , nil
23− , null
24− -- * Textual Representation
25− , toString
26− , fromString
27− , toText
28− , fromText
29− , toASCIIBytes
30− , fromASCIIBytes
31− , toLazyASCIIBytes
32− , fromLazyASCIIBytes
33− -- * Binary Representation
34− , toByteString
35− , fromByteString
36− -- * Integer Representation
37− , toWords
38− , fromWords
39− , toWords64
40− , fromWords64
41− ) where
42−
43−import Data.UUID.Types.Internal
44−import Prelude ()
45−
46−-- Everything is really implemented in Data.UUID.Types.Internal, but I
47−-- don't want to export the constructors out of the package.
uuid-bench/bench/uuid-types-benchmark.hs → uuid-types/tests/BenchUUID.hsrenamed+40−56
@@ -1,22 +1,19 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2
2
3#if !(MIN_VERSION_bytestring(0,10,0))
3#if !(MIN_VERSION_bytestring(0,10,0))
4−{-# OPTIONS_GHC -fno-warn-orphans #-}
5-- Needed for NFData instance
4-- Needed for NFData instance
6−import Control.DeepSeq
5+import Control.DeepSeq
7import qualified Data.ByteString.Lazy.Internal as BL
6import qualified Data.ByteString.Lazy.Internal as BL
8#endif
7#endif
9−import Criterion.Main
8+import Criterion.Main
9+import Data.Maybe (fromJust)
10+import qualified Data.Set as Set
10−import qualified Data.ByteString.Lazy as BL
11+import qualified Data.ByteString.Lazy as BL
11−import qualified Data.HashSet as HashSet
12+import qualified Data.UUID.Types as U
12−import Data.Maybe (fromJust)
13−import qualified Data.Set as Set
14−import qualified Data.UUID.Types as U
15−import Foreign (alloca, peek, poke)
13+import Foreign (alloca, peek, poke)
16−import System.Random
14+import System.Random
17
15
18#if !(MIN_VERSION_bytestring(0,10,0))
16#if !(MIN_VERSION_bytestring(0,10,0))
19−-- orphan
20instance NFData BL.ByteString where
17instance NFData BL.ByteString where
21 rnf BL.Empty = ()
18 rnf BL.Empty = ()
22 rnf (BL.Chunk _ ts) = rnf ts
19 rnf (BL.Chunk _ ts) = rnf ts
@@ -24,56 +21,43 @@ instance NFData BL.ByteString where
24
21
25main :: IO ()
22main :: IO ()
26main = do
23main = do
27− u1 <- randomIO
24+ u1 <- randomIO
28− let s1 = U.toString u1
25+ let s1 = U.toString u1
29− b1 = U.toByteString u1
26+ b1 = U.toByteString u1
30− a1 = U.toASCIIBytes u1
31− t1 = U.toText u1
32− (w1a,w1b,w1c,w1d) = U.toWords u1
33− nil2 = fromJust $
27+ nil2 = fromJust $
34− U.fromString "00000000-0000-0000-0000-000000000000"
28+ U.fromString "00000000-0000-0000-0000-000000000000"
35− u2a = fromJust $ U.fromString "169a5a43-c051-4a16-98f4-08447ddd5dc0"
29+ u2a = fromJust $ U.fromString "169a5a43-c051-4a16-98f4-08447ddd5dc0"
36− u2b = fromJust $ U.fromByteString $
30+ u2b = fromJust $ U.fromByteString $
37− BL.pack [0x16, 0x9a, 0x5a, 0x43, 0xc0, 0x51, 0x4a, 0x16,
31+ BL.pack [0x16, 0x9a, 0x5a, 0x43, 0xc0, 0x51, 0x4a, 0x16,
38− 0x98, 0xf4, 0x08, 0x44, 0x7d, 0xdd, 0x5d, 0xc0]
32+ 0x98, 0xf4, 0x08, 0x44, 0x7d, 0xdd, 0x5d, 0xc0]
39− u3 = fromJust $ U.fromString "dea6f619-1038-438b-b4af-f1cdec1e6e23"
33+ u3 = fromJust $ U.fromString "dea6f619-1038-438b-b4af-f1cdec1e6e23"
40
34
41− -- setup for Storable benchmark
35+ -- setup for Storable benchmark
42− alloca $ \ uuidPtr -> do
36+ alloca $ \ uuidPtr -> do
43
37
44− poke uuidPtr u1
38+ poke uuidPtr u1
45
39
46− defaultMain [
40+ defaultMain [
47− bgroup "testing" [
41+ bgroup "testing" [
48− bench "null non-nil" $ whnf U.null u1,
42+ bench "null non-nil" $ whnf U.null u1,
49− bench "null nil" $ whnf U.null U.nil,
43+ bench "null nil" $ whnf U.null U.nil,
50− bench "null nil2" $ whnf U.null nil2,
44+ bench "null nil2" $ whnf U.null nil2,
51− bench "eq same" $ whnf (==u2a) u2b,
45+ bench "eq same" $ whnf (==u2a) u2b,
52− bench "eq differ" $ whnf (==u2a) u3,
46+ bench "eq differ" $ whnf (==u2a) u3
53− bench "compare same" $ whnf (compare u2a) u2b,
47+ ],
54− bench "compare differ" $ whnf (compare u2a) u3
55− ],
56− bgroup "conversion" [
48+ bgroup "conversion" [
57− bench "toString" $ nf U.toString u1,
49+ bench "toString" $ nf U.toString u1,
58− bench "fromString" $ nf U.fromString s1,
50+ bench "fromString" $ nf U.fromString s1,
59− bench "toByteString" $ nf U.toByteString u1,
51+ bench "toByteString" $ nf U.toByteString u1,
60− bench "fromByteString" $ nf U.fromByteString b1,
52+ bench "fromByteString" $ nf U.fromByteString b1
61− bench "toASCIIBytes" $ nf U.toASCIIBytes u1,
53+ ],
62− bench "fromASCIIBytes" $ nf U.fromASCIIBytes a1,
54+ bench "set making" $ nf Set.fromList uuids,
63− bench "toWords" $ nf U.toWords u1,
64− bench "fromWords" $ nf (U.fromWords w1a w1b w1c) w1d,
65− bench "toText" $ nf U.toText u1,
66− bench "fromText" $ nf U.fromText t1
67− ],
68
55
69− bench "Set making" $ nf Set.fromList uuids,
70− bench "HashSet making" $ nf HashSet.fromList uuids,
71−
72− bgroup "storable" [
56+ bgroup "storable" [
73− bench "peek" $ nfIO (peek uuidPtr),
57+ bench "peek" $ nfIO (peek uuidPtr),
74− bench "poke" $ whnfIO $ poke uuidPtr u1
58+ bench "poke" $ whnfIO $ poke uuidPtr u1
59+ ]
75 ]
60 ]
76− ]
77
61
78-- 50 uuids, so tests can be repeatable
62-- 50 uuids, so tests can be repeatable
79uuids :: [U.UUID]
63uuids :: [U.UUID]
uuid-types/tests/TestUUID.hs+15−49
@@ -1,29 +1,22 @@
1{-# LANGUAGE ViewPatterns #-}
1{-# LANGUAGE ViewPatterns #-}
2−{-# LANGUAGE TemplateHaskell #-}
3
2
4−{-# OPTIONS_GHC -fno-warn-orphans #-}
5−
6−import Data.Binary (encode)
7−import qualified Data.ByteString.Char8 as BC8
8−import qualified Data.ByteString.Lazy as BL
3+import qualified Data.ByteString.Lazy as BL
9import qualified Data.ByteString.Lazy.Char8 as BL8
4import qualified Data.ByteString.Lazy.Char8 as BL8
5+import qualified Data.ByteString.Char8 as BC8
10−import Data.Char (ord)
6+import Data.Char (ord)
11−import Data.Functor ((<$>))
7+import Data.Functor ((<$>))
8+import Data.Word
12−import qualified Data.UUID.Types as U
9+import qualified Data.UUID.Types as U
13−import Data.Word
14−import Foreign (alloca, castPtr, peek, poke,
10+import Foreign (alloca, peek, poke)
15− sizeOf)
16−import GHC.ByteOrder (ByteOrder(..), targetByteOrder)
17−import System.IO.Unsafe (unsafePerformIO)
11+import System.IO.Unsafe (unsafePerformIO)
18
12
19−import Test.QuickCheck (Arbitrary (arbitrary), choose)
13+import Test.QuickCheck ( Arbitrary(arbitrary), choose )
20
14
21−import Test.Tasty (TestTree, defaultMain, testGroup)
15+import Test.Tasty ( defaultMain, TestTree, testGroup )
22−import Test.Tasty.HUnit (assertBool, testCase, (@=?), (@?=))
16+import Test.Tasty.HUnit ( assertBool, (@?=), (@=?), testCase )
23−import Test.Tasty.QuickCheck (testProperty)
17+import Test.Tasty.QuickCheck ( testProperty )
24
18
25
19
26−-- orphan
27instance Arbitrary U.UUID where
20instance Arbitrary U.UUID where
28 -- the UUID random instance ignores bounds
21 -- the UUID random instance ignores bounds
29 arbitrary = choose (U.nil, U.nil)
22 arbitrary = choose (U.nil, U.nil)
@@ -41,11 +34,6 @@ test_nil = testGroup "nil" [
41 testCase "nil bytes" $ U.toByteString U.nil @?= BL.pack (replicate 16 0)
34 testCase "nil bytes" $ U.toByteString U.nil @?= BL.pack (replicate 16 0)
42 ]
35 ]
43
36
44−test_lift :: Test
45−test_lift = testCase "TH.Lift" $ do
46− let uuid = U.fromWords64 123456789 987654321
47− uuid @?= $( [| uuid |] )
48−
49test_conv :: Test
37test_conv :: Test
50test_conv = testGroup "conversions" [
38test_conv = testGroup "conversions" [
51 testCase "conv bytes to string" $
39 testCase "conv bytes to string" $
@@ -61,32 +49,13 @@ test_fromByteString :: Test
61test_fromByteString =
49test_fromByteString =
62 testCase "UUID fromByteString" $
50 testCase "UUID fromByteString" $
63 Just inputUUID @=?
51 Just inputUUID @=?
64− U.fromByteString (BL8.pack "\xa5\xca\x85\x66\xd9\xc5\x48\x35\x99\xc8\xe1\xf1\x3e\x73\xb5\xe2")
52+ U.fromByteString (BL8.pack "\165\202\133f\217\197H5\153\200\225\241>s\181\226")
65
53
66-- | Test fromWords with a fixed-input
54-- | Test fromWords with a fixed-input
67test_fromWords :: Test
55test_fromWords :: Test
68test_fromWords =
56test_fromWords =
69 testCase "UUID fromWords" $
57 testCase "UUID fromWords" $
70− inputUUID @=? U.fromWords 0xa5ca8566 0xd9c54835 0x99c8e1f1 0x3e73b5e2
58+ inputUUID @=? U.fromWords 2781513062 3653584949 2580079089 1047770594
71−
72−
73−test_Storeable :: Test
74−test_Storeable =
75− testCase "UUID Storeable(poke)" $
76− case targetByteOrder of
77− LittleEndian -> BC8.pack "\x66\x85\xca\xa5\xc5\xd9\x35\x48\x99\xc8\xe1\xf1\x3e\x73\xb5\xe2" @=? pokeAsBS inputUUID
78− BigEndian -> BC8.pack "\xa5\xca\x85\x66\xd9\xc5\x48\x35\x99\xc8\xe1\xf1\x3e\x73\xb5\xe2" @=? pokeAsBS inputUUID
79− where
80− pokeAsBS :: U.UUID -> BC8.ByteString
81− pokeAsBS uuid = unsafePerformIO $ do
82− alloca $ \ptr -> do
83− poke ptr uuid
84− BC8.packCStringLen (castPtr ptr, sizeOf uuid)
85−
86−test_Binary :: Test
87−test_Binary =
88− testCase "UUID Binary(encode)" $
89− (BL8.pack "\xa5\xca\x85\x66\xd9\xc5\x48\x35\x99\xc8\xe1\xf1\x3e\x73\xb5\xe2") @=? encode inputUUID
90
59
91inputUUID :: U.UUID
60inputUUID :: U.UUID
92inputUUID = read "a5ca8566-d9c5-4835-99c8-e1f13e73b5e2"
61inputUUID = read "a5ca8566-d9c5-4835-99c8-e1f13e73b5e2"
@@ -182,12 +151,9 @@ main = do
182 [ [
151 [ [
183 test_null,
152 test_null,
184 test_nil,
153 test_nil,
185− test_lift,
186 test_conv,
154 test_conv,
187 test_fromByteString,
155 test_fromByteString,
188− test_fromWords,
156+ test_fromWords
189− test_Storeable,
190− test_Binary
191 ]
157 ]
192 , [ prop_stringRoundTrip,
158 , [ prop_stringRoundTrip,
193 prop_readShowRoundTrip,
159 prop_readShowRoundTrip,
uuid-types/tests/summarize-bench-results.plnew file+14
@@ -0,0 +1,14 @@
1+#!/usr/bin/env perl
2+
3+
4+while(<>) {
5+ if (/^benchmarking (.*)$/) {
6+ $name = $1;
7+ }
8+ if (/^mean:\s*([\d.]*) (\w*),/) {
9+ $mean = 1 * $1;
10+ $units = $2;
11+
12+ printf "%-30s %10.2f %2s\n", $name, $mean, $units;
13+ }
14+}
uuid-types/uuid-types.cabal+64−86
@@ -1,99 +1,77 @@
1−cabal-version: 1.12
2−name: uuid-types
1+Name: uuid-types
3−version: 1.0.6
2+Version: 1.0.0
4−x-revision: 2
5−copyright:
6− (c) 2017-2018 Herbert Valerio Riedel
7− (c) 2008-2014 Antoine Latter
3+Copyright: (c) 2008-2014 Antoine Latter
4+Author: Antoine Latter
5+Maintainer: aslatter@gmail.com
6+License: BSD3
7+License-file: LICENSE
8
8
9−author: Antoine Latter
9+Category: Data
10−maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
11−license: BSD3
12−license-file: LICENSE
13−category: Data
14−build-type: Simple
10+Build-Type: Simple
15−tested-with:
11+Cabal-Version: >= 1.8
16− GHC ==8.6.5
17− || ==8.8.4
18− || ==8.10.7
19− || ==9.0.2
20− || ==9.2.8
21− || ==9.4.8
22− || ==9.6.6
23− || ==9.8.4
24− || ==9.10.1
25− || ==9.12.1
26
12
27−synopsis: Type definitions for Universally Unique Identifiers
13+Description:
28−description:
29− This library contains type definitions for
14+ This library contains type definitions for Universally Unique Identifiers
30− <https://en.wikipedia.org/wiki/UUID Universally Unique Identifiers (UUID)>
31− (as specified in
32− <http://tools.ietf.org/html/rfc4122 RFC 4122>)
33− and basic conversion functions.
15+ and basic conversion functions.
34− .
35− See also the <https://hackage.haskell.org/package/uuid 'uuid' package>
36− providing a high-level API for managing the different UUID versions.
37
16
38−homepage: https://github.com/haskell-hvr/uuid
17+ See <http://en.wikipedia.org/wiki/UUID> for the general idea.
39−bug-reports: https://github.com/haskell-hvr/uuid/issues
40−extra-source-files: ChangeLog.md
41
18
42−source-repository head
19+Synopsis: Type definitions for Universally Unique Identifiers
43− type: git
44− location: https://github.com/haskell-hvr/uuid.git
45− subdir: uuid-types
46
20
47−library
21+Homepage: https://github.com/aslatter/uuid
48− build-depends:
22+Bug-Reports: https://github.com/aslatter/uuid/issues
49− base >=4.12.0.0 && <5
50− , binary >=0.8.6.0 && <0.9
51− , bytestring >=0.10.8.2 && <0.13
52− , deepseq >=1.4.4.0 && <1.6
53− , hashable >=1.4.4.0 && <1.6
54− , random >=1.2.1.2 && <1.3
55− , template-haskell >=2.14.0.0 && <2.24
56− , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
57
23
58− exposed-modules: Data.UUID.Types
24+Extra-Source-Files:
25+ CHANGES
26+ CONTRIBUTORS
59
27
60− -- Exposed for companion projects; *NOT* part of the official API:
61− exposed-modules:
62− Data.UUID.Types.Internal
63− Data.UUID.Types.Internal.Builder
64
28
65− default-language: Haskell2010
29+Library
66− other-extensions:
30+ Build-Depends: base >=3 && < 5,
67− DeriveDataTypeable
31+ binary >= 0.4 && < 0.8,
68− TypeFamilies
32+ bytestring >= 0.9 && < 0.11,
33+ deepseq >= 1.3 && < 1.5,
34+ hashable (>= 1.1.1.0 && < 1.2.0) || (>= 1.2.1 && < 1.3),
35+ random >= 1.0.1 && < 1.2
69
36
70− ghc-options: -Wall
37+ Exposed-Modules:
71− hs-source-dirs: src
38+ Data.UUID.Types
39+ -- Exposed for companion projects; *NOT* part of the official API:
40+ Data.UUID.Types.Internal.Builder
41+ Data.UUID.Types.Internal
72
42
73−test-suite testuuid
43+ Extensions: DeriveDataTypeable
74− type: exitcode-stdio-1.0
44+ Ghc-Options: -Wall
75− main-is: TestUUID.hs
76− hs-source-dirs: tests
77− default-language: Haskell2010
78− other-extensions: ViewPatterns
79− ghc-options: -Wall
80− if impl(ghc >= 8.10)
81− ghc-options: -Wunused-packages
82
45
83− -- inherited constraints
46+source-repository head
84− build-depends:
47+ type: git
85− base
48+ location: https://github.com/aslatter/uuid.git
86− , binary
87− , bytestring
88− , template-haskell
89− , uuid-types
90
49
91− -- deps w/o inherited constraints
50+Test-Suite testuuid
92− build-depends:
51+ Type: exitcode-stdio-1.0
93− QuickCheck >=2.14.2 && <2.16
52+ Main-is: TestUUID.hs
94− , tasty >=1.4.0.1 && <1.6
53+ Hs-source-dirs: tests
54+ Extensions: DeriveDataTypeable
55+ Ghc-Options: -Wall -fno-warn-orphans
56+ Build-Depends: base >= 3 && < 5,
57+ uuid-types,
58+ bytestring >= 0.9 && < 0.11,
59+ HUnit >=1.2 && < 1.3,
60+ QuickCheck >=2.4 && < 2.9,
61+ tasty == 0.10.*,
95− , tasty-hunit >=0.10 && <0.11
62+ tasty-hunit == 0.9.*,
96− , tasty-quickcheck >=0.10 && <0.12
63+ tasty-quickcheck == 0.8.*
97
64
98− if !impl(ghc >=8.4)
65+benchmark benchmark
99− build-depends: ghc-byteorder >=4.11 && <4.12
66+ Type: exitcode-stdio-1.0
67+ Main-is: BenchUUID.hs
68+ Hs-source-dirs: tests
69+ Extensions: DeriveDataTypeable, CPP
70+ Ghc-Options: -Wall -fno-warn-orphans
71+ Build-depends: base == 4.*,
72+ uuid-types,
73+ bytestring >= 0.9 && < 0.11,
74+ containers >= 0.4 && < 0.6,
75+ criterion >= 0.4 && < 1.2,
76+ deepseq >= 1.1 && < 1.5,
77+ random >= 1.0.1 && < 1.2
uuid/CHANGES.md → uuid/CHANGESrenamed+22−62
@@ -1,43 +1,3 @@
1−1.3.16
2−
3−- Support GHC-8.6.5...9.10.1
4−
5−1.3.15
6−
7−- Add (Template Haskell) `Lift UUID` instance
8−
9−1.3.14
10−
11−- Use more compact heap object representation which saves 16 bytes on 64bit platforms.
12−- Add `toWords64`/`fromWords64` functions
13−
14−1.3.13
15−
16−- Optimize `V4.nextRandom` (~3x speed increase)
17−- Optimize UUID V3 & V5 generation (~2x speed increase)
18−- Use `cryptohash-md5`/`cryptohash-sha1`/`entropy` instead
19− of `memory`/`cryptonite` for better performance and stability,
20− but GHCJS is now no longer supported.
21−- Update cabal-spec to version 1.10
22−
23−1.3.12
24−
25−- Update package dependencies
26−- Use `cryptonite` for crypto
27−- The function `V4.nextRandom` is now implemented with functions from
28− `Crypto.Random` in package `cryptonite`. This does slow-down random
29− UUID generation but provides for far greater randomness. The
30− `Random` instance for `UUID` can be used to re-gain the old
31− behavior.
32−
33−1.3.11
34−
35−- Add `toText`/`fromText`
36−
37−1.3.10
38−
39−- Update dependencies in tests and benchmarks.
40−
411.3.9
11.3.9
42
2
43- Split definition of UUID data type into separate Cabal package to
3- Split definition of UUID data type into separate Cabal package to
@@ -45,11 +5,11 @@
45
5
461.3.8
61.3.8
47
7
48−- Allow building against newer `deepseq`.
8+- Allow building against newer deepseq.
49
9
501.3.7
101.3.7
51
11
52−- Allow building against newer `time`.
12+- Allow building against newer time.
53
13
541.3.6
141.3.6
55
15
@@ -57,58 +17,58 @@
57
17
581.3.5
181.3.5
59
19
60−- Allow building against newer `random`.
20+- Allow building against newer random.
61
21
621.3.4
221.3.4
63
23
64−- Allow building against newer `QuickCheck`.
24+- Allow building against newer QuickCheck.
65
25
661.3.3
261.3.3
67
27
68−- More complex version constraints on `hashable`, to avoid building against
28+- More complex version constrainsts on hashable, to avoid building against
69 versions less than 1.1.1.0 or equal to 1.2.0.*.
29 versions less than 1.1.1.0 or equal to 1.2.0.*.
70
30
711.3.2
311.3.2
72
32
73−- Fix for building against `bytestring` 0.9.*
33+- Fix for building against bytestring 0.9.*
74
34
751.3.1
351.3.1
76
36
77−- Allow building against `hashable` 1.1.* in addition to 1.2.*
37+- Allow building against 'hashable' 1.1.* in addition to 1.2.*
78
38
791.3.0
391.3.0
80
40
81- New functions for parsing and printing UUIDs to and from ASCII BytesStrings
41- New functions for parsing and printing UUIDs to and from ASCII BytesStrings
82−- New module `Data.UUID.Util`. This module includes the type `UnpackedUUID`,
42+- New module Data.UUID.Util. This module includes the type 'UnpackedUUID',
83 whose fields correspond to the UUID fields described in RFC 4122.
43 whose fields correspond to the UUID fields described in RFC 4122.
84−- The `Storable` instance now stores a UUID in host byte-order instead of
44+- The Storable instance now stores a UUID in host byte-order instead of
85 big endian.
45 big endian.
86−- There is now an instance for `Hashable UUID`.
46+- There is now an instance for 'Hashable UUID'.
87
47
881.2.13
481.2.13
89
49
90Benchmark only changes:
50Benchmark only changes:
91
51
92−- Allow `criterion` 0.8.*
52+- Allow criterion 0.8.*
93
53
941.2.12
541.2.12
95
55
96Test only changes:
56Test only changes:
97
57
98−- Allow `QuickCheck` 2.6.*
58+- Allow QuickCheck 2.6.*
99
59
1001.2.11
601.2.11
101
61
102−- Allow `binary` 0.7.*
62+- Allow binary 0.7.*
103
63
1041.2.10
641.2.10
105
65
106−- Allow `cryptohash` version 0.9.*
66+- Allow cryptohash version 0.9.*
107- Cleanup tests
67- Cleanup tests
108
68
1091.2.9
691.2.9
110
70
111−- Bumped dependency on `cryptohash`.
71+- Bumped dependency on 'cryptohash'.
112
72
1131.2.8
731.2.8
114
74
@@ -116,13 +76,13 @@ Test only changes:
116
76
1171.2.7
771.2.7
118
78
119−- Added stricter constraints on `random` package.
79+- Added stricter constraints on 'random' package.
120
80
1211.2.6
811.2.6
122
82
123−- Add module `V4` to direct attention to our Random instance
83+- Add module 'V4' to direct attention to our Random instance
124
84
125−- In module `V1` seed the generator with a random number
85+- In module 'V1' seed the generator with a random number
126 if the hardware MAC address could not be discovered.
86 if the hardware MAC address could not be discovered.
127
87
128- Fix and cleanup various haddocks.
88- Fix and cleanup various haddocks.
@@ -132,7 +92,7 @@ Test only changes:
132
92
1331.2.5
931.2.5
134
94
135−- Use `cryptohash` package for MD5 and SHA1 instead of `Crypto`
95+- Use 'cryptohash' package for MD5 and SHA1 instead of 'Crypto'
136
96
1371.2.4
971.2.4
138
98
@@ -165,7 +125,7 @@ and a test case)
165 (Contributors: Antoine Latter & Mark Lentczner)
125 (Contributors: Antoine Latter & Mark Lentczner)
166
126
167- added functions toByteString and fromByteString
127- added functions toByteString and fromByteString
168−- added `nil` UUID
128+- added 'nil' UUID
169- added unit tests and benchmarks, built when configured -ftest
129- added unit tests and benchmarks, built when configured -ftest
170- major speed up of to/from functions (as well as in general)
130- major speed up of to/from functions (as well as in general)
171- added version-3 generation (deterministic based on MD5)
131- added version-3 generation (deterministic based on MD5)
@@ -181,6 +141,6 @@ and a test case)
181
141
1821.1.1
1421.1.1
183
143
184−- no longer exporting `null` from the prelude
144+- no longer exporting 'null' from the prelude
185−- add `null` predicate on UUIDs
145+- add 'null' predicate on UUIDs
186- documentation fix (thanks Mark Lentczner)
146- documentation fix (thanks Mark Lentczner)
uuid/CONTRIBUTORSnew file+13
@@ -0,0 +1,13 @@
1+In order of appearance:
2+
3+Antoine Latter
4+Jason Dusek
5+Tim Newsham
6+Mark Lentczner
7+Neil Mitchell
8+Bas van Dijk
9+Sergei Trofimovich
10+davean
11+Francesco Mazzoli
12+Michael Snoyman
13+Bardur Arantsson
uuid/src/Data/UUID.hs → uuid/Data/UUID.hsrenamed+5−7
@@ -14,9 +14,11 @@ printing Universally Unique Identifiers.
14See <http://en.wikipedia.org/wiki/UUID> for the general idea.
14See <http://en.wikipedia.org/wiki/UUID> for the general idea.
15See <http://tools.ietf.org/html/rfc4122> for the specification.
15See <http://tools.ietf.org/html/rfc4122> for the specification.
16
16
17−* Use 'Data.UUID.V4.nextRandom' to generate secure random UUIDs, and your
17+* Random UUIDs may be generated using 'Data.UUID.V4.nextRandom' or
18−favorite instance of 'System.Random.Random' for faster but insecure
18+your favorite instance of 'System.Random.Random'.
19−generation of UUIDs.
19+
20+* We have an implementation of generating a UUID from the hardware
21+MAC address and current system time in "Data.UUID.V1".
20
22
21* For name-based generation of UUIDs using SHA-1 hashing see
23* For name-based generation of UUIDs using SHA-1 hashing see
22"Data.UUID.V5".
24"Data.UUID.V5".
@@ -24,8 +26,6 @@ generation of UUIDs.
24module Data.UUID(UUID
26module Data.UUID(UUID
25 ,toString
27 ,toString
26 ,fromString
28 ,fromString
27− ,toText
28− ,fromText
29 ,toASCIIBytes
29 ,toASCIIBytes
30 ,fromASCIIBytes
30 ,fromASCIIBytes
31 ,toLazyASCIIBytes
31 ,toLazyASCIIBytes
@@ -34,8 +34,6 @@ module Data.UUID(UUID
34 ,fromByteString
34 ,fromByteString
35 ,toWords
35 ,toWords
36 ,fromWords
36 ,fromWords
37− ,toWords64
38− ,fromWords64
39 ,null
37 ,null
40 ,nil
38 ,nil
41 ) where
39 ) where
uuid/src/Data/UUID/Named.hs → uuid/Data/UUID/Named.hsrenamed

The content is the same.

uuid/src/Data/UUID/Util.hs → uuid/Data/UUID/Util.hsrenamed+11
@@ -3,6 +3,7 @@ module Data.UUID.Util (
3 UnpackedUUID(..)
3 UnpackedUUID(..)
4 , unpack, pack
4 , unpack, pack
5 , version
5 , version
6+ , extractMac
6 , extractTime
7 , extractTime
7 , setTime
8 , setTime
8 ) where
9 ) where
@@ -12,6 +13,7 @@ import Data.Word
12import Data.Word.Util
13import Data.Word.Util
13import Data.Bits
14import Data.Bits
14import Data.UUID.Types.Internal
15import Data.UUID.Types.Internal
16+import Network.Info
15import Data.Int (Int64)
17import Data.Int (Int64)
16
18
17version :: UUID -> Int
19version :: UUID -> Int
@@ -40,3 +42,12 @@ extractTime uuid =
40
42
41timeAndVersionToTime :: Word16 -> Word16
43timeAndVersionToTime :: Word16 -> Word16
42timeAndVersionToTime tv = tv .&. 0x0FFF
44timeAndVersionToTime tv = tv .&. 0x0FFF
45+
46+extractMac :: UUID -> Maybe MAC
47+extractMac uuid =
48+ if version uuid == 1
49+ then Just $
50+ MAC (node_0 unpacked) (node_1 unpacked) (node_2 unpacked) (node_3 unpacked) (node_4 unpacked) (node_5 unpacked)
51+ else Nothing
52+ where
53+ unpacked = unpack uuid
uuid/Data/UUID/V1.hsnew file+135
@@ -0,0 +1,135 @@
1+{-# OPTIONS_GHC -fno-cse #-}
2+{-# LANGUAGE TypeFamilies #-}
3+
4+{- |
5+Module : Data.UUID.V1
6+Copyright : (c) 2008 Jason Dusek
7+ (c) 2009 Mark Lentczner
8+ (c) 2009-2010,2012 Antoine Latter
9+
10+License : BSD-style
11+
12+Maintainer : aslatter@gmail.com
13+Stability : experimental
14+Portability : portable
15+
16+RFC 4122 Version 1 UUID state machine.
17+
18+The generated UUID is based on the hardware MAC
19+address and the system clock.
20+
21+If we cannot lookup the MAC address we seed the
22+generator with a psuedo-random number.
23+-}
24+
25+module Data.UUID.V1(nextUUID)
26+where
27+
28+
29+import Data.Bits
30+import Data.Maybe
31+import Data.Time
32+import Data.Word
33+
34+import Control.Applicative ((<$>),(<*>))
35+import Control.Concurrent.MVar
36+import System.IO.Unsafe
37+
38+import qualified System.Random as R
39+
40+import Network.Info
41+
42+import Data.UUID.Types.Internal.Builder
43+import Data.UUID.Types.Internal
44+
45+-- | Returns a new UUID derived from the local hardware MAC
46+-- address and the current system time.
47+-- Is generated according to the Version 1 UUID sepcified in
48+-- RFC 4122.
49+--
50+-- Returns 'Nothing' if you request UUIDs too quickly.
51+nextUUID :: IO (Maybe UUID)
52+nextUUID = do
53+ res <- stepTime
54+ case res of
55+ Just (mac', c, t) -> return $ Just $ makeUUID t c mac'
56+ _ -> return Nothing
57+
58+
59+makeUUID :: Word64 -> Word16 -> MAC -> UUID
60+makeUUID time clock mac' =
61+ buildFromBytes 1 /-/ tLow /-/ tMid /-/ tHigh /-/ clock /-/ (MACSource mac')
62+ where tLow = (fromIntegral time) :: Word32
63+ tMid = (fromIntegral (time `shiftR` 32)) :: Word16
64+ tHigh = (fromIntegral (time `shiftR` 48)) :: Word16
65+
66+newtype MACSource = MACSource MAC
67+instance ByteSource MACSource where
68+ z /-/ (MACSource (MAC a b c d e f)) = z a b c d e f
69+type instance ByteSink MACSource g = Takes3Bytes (Takes3Bytes g)
70+
71+
72+-- |Approximates the clock algorithm in RFC 4122, section 4.2
73+-- Isn't system wide or thread safe, nor does it properly randomize
74+-- the clock value on initialization.
75+stepTime :: IO (Maybe (MAC, Word16, Word64))
76+stepTime = do
77+ h1 <- fmap hundredsOfNanosSinceGregorianReform getCurrentTime
78+ modifyMVar state $ \s@(State mac' c0 h0) ->
79+ if h1 > h0
80+ then
81+ return (State mac' c0 h1, Just (mac', c0, h1))
82+ else
83+ let
84+ c1 = succ c0
85+ in if c1 <= 0x3fff -- when clock is initially randomized,
86+ -- then this test will need to change
87+ then
88+ return (State mac' c1 h1, Just (mac', c1, h1))
89+ else
90+ return (s, Nothing)
91+
92+
93+{-# NOINLINE state #-}
94+state :: MVar State
95+state = unsafePerformIO $ do
96+ h0 <- fmap hundredsOfNanosSinceGregorianReform getCurrentTime
97+ mac' <- getMac
98+ newMVar $ State mac' 0 h0 -- the 0 should be a random number
99+
100+-- SysMAC.mac can fail on some machines.
101+-- In those cases we fake it with a random
102+-- 6 bytes seed.
103+getMac :: IO MAC
104+getMac =
105+ getNetworkInterfaces >>=
106+ return . listToMaybe . filter (minBound /=) . map mac >>=
107+ \macM -> case macM of
108+ Just m -> return m
109+ Nothing -> randomMac
110+
111+randomMac :: IO MAC
112+randomMac =
113+ -- I'm too lazy to thread through
114+ -- the random state ...
115+ MAC
116+ <$> (R.randomIO >>= return . (1 .|.)) -- We must set the multicast bit to True. See section 4.5 of the RFC.
117+ <*> R.randomIO
118+ <*> R.randomIO
119+ <*> R.randomIO
120+ <*> R.randomIO
121+ <*> R.randomIO
122+
123+data State = State
124+ {-# UNPACK #-} !MAC
125+ {-# UNPACK #-} !Word16
126+ {-# UNPACK #-} !Word64
127+ deriving (Show)
128+
129+
130+
131+hundredsOfNanosSinceGregorianReform :: UTCTime -> Word64
132+hundredsOfNanosSinceGregorianReform t = floor $ 10000000 * dt
133+ where
134+ gregorianReform = UTCTime (fromGregorian 1582 10 15) 0
135+ dt = t `diffUTCTime` gregorianReform
uuid/src/Data/UUID/V3.hs → uuid/Data/UUID/V3.hsrenamed+1−1
@@ -8,7 +8,7 @@ Maintainer : aslatter@gmail.com
8Stability : experimental
8Stability : experimental
9Portability : portable
9Portability : portable
10
10
11−NOTE\: This module uses MD5 hashing. Unless you know
11+NOTE: This module uses MD5 hashing. Unless you know
12you need to use this module, you should probably be
12you need to use this module, you should probably be
13using "Data.UUID.V5", which offers the same sort of
13using "Data.UUID.V5", which offers the same sort of
14functionality as this module except implemented with
14functionality as this module except implemented with
uuid/Data/UUID/V4.hsnew file+28
@@ -0,0 +1,28 @@
1+{- |
2+ Module : Data.UUID.V4
3+ Copyright : (c) 2012 Antoine Latter
4+
5+ License : BSD-style
6+
7+ Maintainer : aslatter@gmail.com
8+ Stability : experimental
9+ Portability : portable
10+
11+ This module implements Version 4 UUIDs as specified
12+ in RFC 4122.
13+
14+ These UUIDs are generated from a psuedo-random generator.
15+ We use the System.Random 'R.StdGen' as our random source.
16+
17+ All of the logic is encapsulated in the 'R.Random' instance
18+ for the UUID type, so you are also free to use the random generator
19+ of your choice.
20+-}
21+module Data.UUID.V4 (nextRandom) where
22+
23+import Data.UUID
24+import qualified System.Random as R
25+
26+-- | Generate a random UUID. Introduced in version 1.2.6.
27+nextRandom :: IO UUID
28+nextRandom = R.randomIO
uuid/src/Data/UUID/V5.hs → uuid/Data/UUID/V5.hsrenamed

The content is the same.

uuid/src/Data/Word/Util.hs → uuid/Data/Word/Util.hsrenamed

The content is the same.

uuid/src/Data/UUID/V4.hsdeleted−33
@@ -1,33 +0,0 @@
1−{- |
2− Module : Data.UUID.V4
3− Copyright : (c) 2012-2016 Antoine Latter
4−
5− License : BSD-style
6−
7− Maintainer : aslatter@gmail.com
8− Stability : experimental
9− Portability : portable
10−
11− This module implements Version 4 UUIDs as specified
12− in RFC 4122.
13−
14− These UUIDs are generated from a pseudo-random generator.
15− We use the 'getEntropy' method from the <https://hackage.haskell.org/package/entropy entropy> package,
16− which should provide cryptographically secure random data.
17−-}
18−module Data.UUID.V4 (nextRandom) where
19−
20−import Data.UUID
21−import Data.UUID.Types.Internal ( buildFromBytes )
22−
23−import System.Entropy ( getEntropy )
24−import Data.ByteString ( unpack )
25−
26−-- | Generate a crytographically secure, random UUID.
27−--
28−-- @since 1.2.6
29−nextRandom :: IO UUID
30−nextRandom = do
31− [b0, b1, b2, b3, b4, b5, b6, b7, b8, b9, ba, bb, bc, bd, be, bf]
32− <- unpack `fmap` getEntropy 16
33− return $ buildFromBytes 4 b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf
uuid-bench/bench/uuid-benchmark.hs → uuid/tests/BenchUUID.hsrenamed+4−3
@@ -1,9 +1,11 @@
1+{-# LANGUAGE CPP #-}
2+
1import Criterion.Main
3import Criterion.Main
2import Data.Char (ord)
4import Data.Char (ord)
3import Data.IORef
5import Data.IORef
4import Data.Word
6import Data.Word
5import qualified Data.UUID as U
7import qualified Data.UUID as U
6−import qualified Data.UUID.V4 as U
8+import qualified Data.UUID.V1 as U
7import qualified Data.UUID.V3 as U3
9import qualified Data.UUID.V3 as U3
8import qualified Data.UUID.V5 as U5
10import qualified Data.UUID.V5 as U5
9import System.Random
11import System.Random
@@ -25,8 +27,7 @@ main = do
25 defaultMain [
27 defaultMain [
26 bgroup "generation" [
28 bgroup "generation" [
27 bench "V1" $ nfIO U.nextUUID,
29 bench "V1" $ nfIO U.nextUUID,
28− bench "V4-stock" $ nfIO (U.nextRandom :: IO U.UUID),
29− bench "V4-mersenne" $ nfIO (randomUUID :: IO U.UUID),
30+ bench "V4" $ nfIO (randomUUID :: IO U.UUID),
30 bench "V3" $ nf (U3.generateNamed U3.namespaceURL) n1,
31 bench "V3" $ nf (U3.generateNamed U3.namespaceURL) n1,
31 bench "V5" $ nf (U5.generateNamed U5.namespaceURL) n1
32 bench "V5" $ nf (U5.generateNamed U5.namespaceURL) n1
32 ]
33 ]
uuid/tests/TestUUID.hs+21−5
@@ -1,18 +1,21 @@
1{-# LANGUAGE ViewPatterns #-}
1{-# LANGUAGE ViewPatterns #-}
2
2
3+import Control.Monad (replicateM)
3import Data.Bits
4import Data.Bits
4import qualified Data.ByteString.Lazy as BL
5import qualified Data.ByteString.Lazy as BL
5import Data.Char (ord)
6import Data.Char (ord)
7+import Data.List (nub, (\\))
6import Data.Maybe
8import Data.Maybe
7import Data.Word
9import Data.Word
8import qualified Data.UUID as U
10import qualified Data.UUID as U
11+import qualified Data.UUID.V1 as U
9import qualified Data.UUID.V3 as U3
12import qualified Data.UUID.V3 as U3
10import qualified Data.UUID.V5 as U5
13import qualified Data.UUID.V5 as U5
11
14
12−import Test.QuickCheck ( Arbitrary(arbitrary) )
15+import Test.QuickCheck ( Arbitrary(arbitrary), choose )
13import Test.Tasty ( TestTree, testGroup, defaultMain )
16import Test.Tasty ( TestTree, testGroup, defaultMain )
14import Test.Tasty.HUnit
17import Test.Tasty.HUnit
15− ( assertBool, (@?=), testCase )
18+ ( Assertable(assert), assertBool, (@?=), testCase )
16import Test.Tasty.QuickCheck ( testProperty )
19import Test.Tasty.QuickCheck ( testProperty )
17
20
18type Test = TestTree
21type Test = TestTree
@@ -21,13 +24,13 @@ isValidVersion :: Int -> U.UUID -> Bool
21isValidVersion v u = lenOK && variantOK && versionOK
24isValidVersion v u = lenOK && variantOK && versionOK
22 where bs = U.toByteString u
25 where bs = U.toByteString u
23 lenOK = BL.length bs == 16
26 lenOK = BL.length bs == 16
24− variantOK = BL.index bs 8 .&. 0xc0 == 0x80
27+ variantOK = (BL.index bs 8) .&. 0xc0 == 0x80
25− versionOK = BL.index bs 6 .&. 0xf0 == fromIntegral (v `shiftL` 4)
28+ versionOK = (BL.index bs 6) .&. 0xf0 == fromIntegral (v `shiftL` 4)
26
29
27
30
28instance Arbitrary U.UUID where
31instance Arbitrary U.UUID where
29 -- the UUID random instance ignores bounds
32 -- the UUID random instance ignores bounds
30− arbitrary = pure U.nil
33+ arbitrary = choose (U.nil, U.nil)
31
34
32
35
33test_null :: Test
36test_null :: Test
@@ -35,6 +38,17 @@ test_null =
35 testCase "namespaceDNS is not null" $
38 testCase "namespaceDNS is not null" $
36 assertBool "" (not $ U.null U3.namespaceDNS)
39 assertBool "" (not $ U.null U3.namespaceDNS)
37
40
41+test_v1 :: [Maybe U.UUID] -> Test
42+test_v1 v1s = testGroup "version 1" [
43+ testCase "V1 unique" $ nub (v1s \\ nub v1s) @?= [],
44+ testGroup "V1 not null" $ map (testUUID (not . U.null)) v1s,
45+ testGroup "V1 valid" $ map (testUUID (isValidVersion 1)) v1s
46+ ]
47+ where testUUID :: (U.UUID -> Bool) -> Maybe U.UUID -> Test
48+ testUUID p u =
49+ testCase (show u) $
50+ assert $ maybe False p u
51+
38test_v3 :: Test
52test_v3 :: Test
39test_v3 =
53test_v3 =
40 testCase "V3 computation" $
54 testCase "V3 computation" $
@@ -79,11 +93,13 @@ prop_v5Valid = testProperty "V5 valid" v5Valid
79
93
80main :: IO ()
94main :: IO ()
81main = do
95main = do
96+ v1s <- replicateM 100 U.nextUUID
82 defaultMain $
97 defaultMain $
83 testGroup "tests" $
98 testGroup "tests" $
84 concat $
99 concat $
85 [ [
100 [ [
86 test_null,
101 test_null,
102+ test_v1 v1s,
87 test_v3,
103 test_v3,
88 test_v5
104 test_v5
89 ]
105 ]
uuid/tests/summarize-bench-results.plnew file+14
@@ -0,0 +1,14 @@
1+#!/usr/bin/env perl
2+
3+
4+while(<>) {
5+ if (/^benchmarking (.*)$/) {
6+ $name = $1;
7+ }
8+ if (/^mean:\s*([\d.]*) (\w*),/) {
9+ $mean = 1 * $1;
10+ $units = $2;
11+
12+ printf "%-30s %10.2f %2s\n", $name, $mean, $units;
13+ }
14+}
uuid/uuid.cabal+72−84
@@ -1,95 +1,83 @@
1−cabal-version: 1.12
2−name: uuid
1+Name: uuid
3−version: 1.3.16
2+Version: 1.3.9
4−x-revision: 2
5−copyright: (c) 2008-2014 Antoine Latter
3+Copyright: (c) 2008-2014 Antoine Latter
6−author: Antoine Latter
4+Author: Antoine Latter
7−maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
5+Maintainer: aslatter@gmail.com
8−license: BSD3
6+License: BSD3
9−license-file: LICENSE
7+License-file: LICENSE
10−category: Data
11−build-type: Simple
12−tested-with:
13− GHC ==8.6.5
14− || ==8.8.4
15− || ==8.10.7
16− || ==9.0.2
17− || ==9.2.8
18− || ==9.4.8
19− || ==9.6.6
20− || ==9.8.4
21− || ==9.10.1
22− || ==9.12.1
23
8
24−synopsis:
9+Category: Data
25− For creating, comparing, parsing and printing Universally Unique Identifiers
10+Build-Type: Simple
11+Cabal-Version: >= 1.8
26
12
27−description:
13+Description:
28− This library is useful for creating, comparing, parsing and
14+ This library is useful for creating, comparing, parsing and
29− printing Universally Unique Identifiers.
15+ printing Universally Unique Identifiers.
30− .
31− See <http://en.wikipedia.org/wiki/UUID> for the general idea.
16+ See <http://en.wikipedia.org/wiki/UUID> for the general idea.
32
17
33−homepage: https://github.com/haskell-hvr/uuid
18+Synopsis: For creating, comparing, parsing and printing Universally Unique Identifiers
34−bug-reports: https://github.com/haskell-hvr/uuid/issues
35−extra-source-files: CHANGES.md
36
19
37−source-repository head
38− type: git
39− location: https://github.com/haskell-hvr/uuid.git
20+Homepage: https://github.com/aslatter/uuid
40− subdir: uuid
21+Bug-Reports: https://github.com/aslatter/uuid/issues
41
22
42−library
23+Extra-Source-Files:
43− build-depends:
24+ CHANGES
44− base >=4.12 && <5
25+ CONTRIBUTORS
45− , binary >=0.8.6.0 && <0.9
46− , bytestring >=0.10.8.2 && <0.13
47− , cryptohash-md5 >=0.11.100 && <0.12
48− , cryptohash-sha1 >=0.11.100 && <0.12
49− , entropy >=0.3.7 && <0.5
50
26
51− -- strict dependency on uuid-types,
52− -- as we re-rexport datatype, thus leak instances etc.
53− build-depends: uuid-types >=1.0.6 && <1.0.7
54− exposed-modules:
55− Data.UUID
56− Data.UUID.Util
57− Data.UUID.V3
58− Data.UUID.V4
59− Data.UUID.V5
60
27
61− other-modules:
28+Library
62− Data.UUID.Named
29+ Build-Depends: base >=3 && < 5,
63− Data.Word.Util
30+ binary >= 0.4 && < 0.8,
31+ bytestring >= 0.9 && < 0.11,
32+ cryptohash >= 0.7 && < 0.12,
33+ network-info == 0.2.*,
34+ random >= 1.0.1 && < 1.2,
35+ time >= 1.1 && < 1.6,
36+ uuid-types >= 1.0 && < 2
64
37
65− default-language: Haskell2010
38+ Exposed-Modules:
66− default-extensions: DeriveDataTypeable
39+ Data.UUID
67− other-extensions: TypeFamilies
40+ Data.UUID.Util
68− ghc-options: -Wall
41+ Data.UUID.V1
69− if impl(ghc >= 8.10)
42+ Data.UUID.V3
70− ghc-options: -Wunused-packages
43+ Data.UUID.V4
71− hs-source-dirs: src
44+ Data.UUID.V5
72
45
73−test-suite testuuid
46+ Other-Modules:
74− type: exitcode-stdio-1.0
47+ Data.UUID.Named
75− main-is: TestUUID.hs
48+ Data.Word.Util
76− hs-source-dirs: tests
77− default-language: Haskell2010
78− default-extensions: DeriveDataTypeable
79− other-extensions: ViewPatterns
80− ghc-options: -Wall -fno-warn-orphans
81− if impl(ghc >= 8.10)
82− ghc-options: -Wunused-packages
83
49
84− -- inherited constraints
50+ Extensions: DeriveDataTypeable
85− build-depends:
51+ Ghc-Options: -Wall
86− base
87− , bytestring
88− , uuid
89
52
90− -- deps w/o inherited constraints
53+source-repository head
91− build-depends:
54+ type: git
92− QuickCheck >=2.14.2 && <2.16
55+ location: https://github.com/aslatter/uuid.git
93− , tasty >=1.4.0.1 && <1.6
56+
94− , tasty-hunit >=0.10 && <0.11
57+Test-Suite testuuid
58+ Type: exitcode-stdio-1.0
59+ Main-is: TestUUID.hs
60+ Hs-source-dirs: tests
61+ Extensions: DeriveDataTypeable
62+ Ghc-Options: -Wall -fno-warn-orphans
63+ Build-Depends: base >= 3 && < 5,
64+ uuid,
65+ bytestring >= 0.9 && < 0.11,
66+ HUnit >=1.2 && < 1.3,
67+ QuickCheck >=2.4 && < 2.9,
68+ random >= 1.0.1 && < 1.2,
69+ tasty == 0.10.*,
70+ tasty-hunit == 0.9.*,
95− , tasty-quickcheck >=0.10 && <0.12
71+ tasty-quickcheck == 0.8.*
72+
73+benchmark benchmark
74+ Type: exitcode-stdio-1.0
75+ Main-is: BenchUUID.hs
76+ Hs-source-dirs: tests
77+ Extensions: DeriveDataTypeable, CPP
78+ Ghc-Options: -Wall -fno-warn-orphans
79+ Build-depends: base == 4.*,
80+ uuid,
81+ criterion >= 0.4 && < 1.2,
82+ mersenne-random-pure64,
83+ random >= 1.0.1 && < 1.2