Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump containers to >= 0.5.8 simplifying shuffleSeq (#352) #358

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump containers to >= 0.5.8 simplifying shuffleSeq (#352) #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hedgehog-example/hedgehog-example.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ library
hedgehog
, hedgehog-quickcheck
, base >= 3 && < 5
, containers >= 0.4 && < 0.7
, containers >= 0.5.8 && < 0.7
, filepath >= 1.3 && < 1.5
, hashtables >= 1.2 && < 1.3
, mmorph >= 1.0 && < 1.2
Expand Down
4 changes: 2 additions & 2 deletions hedgehog/hedgehog.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ library
, async >= 2.0 && < 2.3
, bytestring >= 0.10 && < 0.11
, concurrent-output >= 1.7 && < 1.11
, containers >= 0.4 && < 0.7
, containers >= 0.5.8 && < 0.7
, directory >= 1.2 && < 1.4
, erf >= 2.0 && < 2.1
, exceptions >= 0.7 && < 0.11
Expand Down Expand Up @@ -137,7 +137,7 @@ test-suite test
build-depends:
hedgehog
, base >= 3 && < 5
, containers >= 0.4 && < 0.7
, containers >= 0.5.8 && < 0.7
, mmorph >= 1.0 && < 1.2
, mtl >= 2.1 && < 2.3
, pretty-show >= 1.6 && < 1.10
Expand Down
15 changes: 0 additions & 15 deletions hedgehog/src/Hedgehog/Internal/Gen.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,26 +1607,11 @@ shuffleSeq xs =
pure Seq.empty
else do
n <- integral $ Range.constant 0 (length xs - 1)
#if MIN_VERSION_containers(0,5,8)
-- Data.Sequence should offer a version of deleteAt that returns the
-- deleted element, but it does not currently do so. Lookup followed
-- by deletion seems likely faster than splitting and then appending,
-- but I haven't actually tested that. It's certainly easier to see
-- what's going on.
case Seq.lookup n xs of
Just y ->
(y Seq.<|) <$> shuffleSeq (Seq.deleteAt n xs)
Nothing ->
error "Hedgehog.Gen.shuffleSeq: internal error, lookup in empty sequence"
#else
case Seq.splitAt n xs of
(beginning, end) ->
case Seq.viewl end of
y Seq.:< end' ->
(y Seq.<|) <$> shuffleSeq (beginning Seq.>< end')
Seq.EmptyL ->
error "Hedgehog.Gen.shuffleSeq: internal error, lookup in empty sequence"
#endif

------------------------------------------------------------------------
-- Sampling
Expand Down