Hello community,
here is the log from the commit of package ghc-either for openSUSE:Factory
checked in at 2018-07-24 17:18:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-either (Old)
and /work/SRC/openSUSE:Factory/.ghc-either.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-either"
Tue Jul 24 17:18:23 2018 rev:10 rq:623766 version:5.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-either/ghc-either.changes 2018-05-30
12:25:35.101778317 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-either.new/ghc-either.changes
2018-07-24 17:18:28.022998262 +0200
@@ -1,0 +2,19 @@
+Wed Jul 18 14:26:23 UTC 2018 - psim...@suse.com
+
+- Cosmetic: replace tabs with blanks, strip trailing white space,
+ and update copyright headers with spec-cleaner.
+
+-------------------------------------------------------------------
+Fri Jul 13 14:31:28 UTC 2018 - psim...@suse.com
+
+- Update either to version 5.0.1.
+ 5.0.1 [2018.07.03]
+ ------------------
+ * Make the `Semigroup`, `Apply`, and `Applicative` instances for `Validation`
+ lazier.
+ * Make `vap` lazier in its second argument.
+ * Introduce `vapm`, an even lazier version of `vap` which requires a
+ `Monoid` constraint. Also add `apm`, a counterpart for `Validation`.
+ * Use `test-framework` and `QuickCheck` in the test suite.
+
+-------------------------------------------------------------------
@@ -64 +82,0 @@
-
Old:
----
either-5.tar.gz
New:
----
either-5.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-either.spec ++++++
--- /var/tmp/diff_new_pack.qaoeNS/_old 2018-07-24 17:18:28.518998900 +0200
+++ /var/tmp/diff_new_pack.qaoeNS/_new 2018-07-24 17:18:28.518998900 +0200
@@ -19,7 +19,7 @@
%global pkg_name either
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 5
+Version: 5.0.1
Release: 0
Summary: Combinators for working with sums
License: BSD-3-Clause
@@ -34,7 +34,9 @@
BuildRequires: ghc-semigroupoids-devel
BuildRequires: ghc-semigroups-devel
%if %{with tests}
-BuildRequires: ghc-hedgehog-devel
+BuildRequires: ghc-QuickCheck-devel
+BuildRequires: ghc-test-framework-devel
+BuildRequires: ghc-test-framework-quickcheck2-devel
%endif
%description
++++++ either-5.tar.gz -> either-5.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/either-5/.gitignore new/either-5.0.1/.gitignore
--- old/either-5/.gitignore 2017-11-21 04:04:46.000000000 +0100
+++ new/either-5.0.1/.gitignore 2018-07-03 14:49:45.000000000 +0200
@@ -1,4 +1,5 @@
dist
+dist-newstyle
docs
wiki
TAGS
@@ -13,3 +14,19 @@
*#
.cabal-sandbox/
cabal.sandbox.config
+.stack-work/
+cabal-dev
+*.chi
+*.chs.h
+*.dyn_o
+*.dyn_hi
+.hpc
+.hsenv
+*.prof
+*.aux
+*.hp
+*.eventlog
+cabal.project.local
+cabal.project.local~
+.HTF/
+.ghc.environment.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/either-5/.travis.yml new/either-5.0.1/.travis.yml
--- old/either-5/.travis.yml 2017-11-21 04:04:46.000000000 +0100
+++ new/either-5.0.1/.travis.yml 2018-07-03 14:49:45.000000000 +0200
@@ -1,104 +1,159 @@
-# This file has been generated -- see https://github.com/hvr/multi-ghc-travis
+# This Travis job script has been generated by a script via
+#
+# runghc make_travis_yml_2.hs '-o' '.travis.yml' '--ghc-head'
'--irc-channel=irc.freenode.org#haskell-lens' '--no-no-tests-no-bench'
'--no-unconstrained' 'cabal.project'
+#
+# For more information, see https://github.com/hvr/multi-ghc-travis
+#
language: c
sudo: false
+git:
+ submodules: false # whether to recursively clone submodules
+
+notifications:
+ irc:
+ channels:
+ - "irc.freenode.org#haskell-lens"
+ skip_join: true
+ template:
+ - "\x0313either\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url}
%{message}"
+
cache:
directories:
- - $HOME/.cabsnap
- $HOME/.cabal/packages
+ - $HOME/.cabal/store
before_cache:
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
- - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
+ # remove files that are regenerated by 'cabal update'
+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
+
+ - rm -rfv $HOME/.cabal/packages/head.hackage
matrix:
include:
- - env: CABALVER=1.18 GHCVER=7.4.2
- compiler: ": #GHC 7.4.2"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources:
[hvr-ghc]}}
- - env: CABALVER=1.18 GHCVER=7.6.3
- compiler: ": #GHC 7.6.3"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources:
[hvr-ghc]}}
- - env: CABALVER=1.18 GHCVER=7.8.4
- compiler: ": #GHC 7.8.4"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources:
[hvr-ghc]}}
- - env: CABALVER=1.22 GHCVER=7.10.3
- compiler: ": #GHC 7.10.3"
- addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources:
[hvr-ghc]}}
- - env: CABALVER=1.24 GHCVER=8.0.2
- compiler: ": #GHC 8.0.2"
- addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources:
[hvr-ghc]}}
- - env: CABALVER=2.0 GHCVER=8.2.1
- compiler: ": #GHC 8.2.1"
- addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources:
[hvr-ghc]}}
- - env: CABALVER=head GHCVER=head
- compiler: ": #GHC head"
- addons: {apt: {packages: [cabal-install-head,ghc-head], sources:
[hvr-ghc]}}
+ - compiler: "ghc-8.6.1"
+ env: GHCHEAD=true
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.6.1],
sources: [hvr-ghc]}}
+ - compiler: "ghc-8.4.3"
+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3],
sources: [hvr-ghc]}}
+ - compiler: "ghc-8.2.2"
+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2],
sources: [hvr-ghc]}}
+ - compiler: "ghc-8.0.2"
+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2],
sources: [hvr-ghc]}}
+ - compiler: "ghc-7.10.3"
+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3],
sources: [hvr-ghc]}}
+ - compiler: "ghc-7.8.4"
+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4],
sources: [hvr-ghc]}}
+ - compiler: "ghc-7.6.3"
+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.6.3],
sources: [hvr-ghc]}}
+ - compiler: "ghc-7.4.2"
+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.4.2],
sources: [hvr-ghc]}}
+ - compiler: "ghc-7.2.2"
+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.2.2],
sources: [hvr-ghc]}}
+ - compiler: "ghc-7.0.4"
+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.0.4],
sources: [hvr-ghc]}}
+ - compiler: "ghc-head"
+ env: GHCHEAD=true
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head],
sources: [hvr-ghc]}}
allow_failures:
- - env: CABALVER=head GHCVER=head
+ - compiler: "ghc-head"
+ - compiler: "ghc-7.0.4"
+ - compiler: "ghc-7.2.2"
+ - compiler: "ghc-8.6.1"
before_install:
- - unset CC
- - export
PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+ - HC=${CC}
+ - HCPKG=${HC/ghc/ghc-pkg}
+ - unset CC
+ - ROOTDIR=$(pwd)
+ - mkdir -p $HOME/.local/bin
+ - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
+ - HCNUMVER=$(( $(${HC} --numeric-version|sed -E
's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
+ - echo $HCNUMVER
install:
- - cabal --version
- - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null ||
echo '?')]"
- - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
- then
- zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >
- $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
- fi
- - travis_retry cabal update -v
- - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- - cabal install --only-dependencies --dry -v > installplan.txt
- - sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt
-
-# check whether current requested install-plan matches cached package-db
snapshot
- - if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;
- then
- echo "cabal build-cache HIT";
- rm -rfv .ghc;
- cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
- cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin
$HOME/.cabal/;
- else
- echo "cabal build-cache MISS";
- rm -rf $HOME/.cabsnap;
- mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
- cabal install -j --only-dependencies;
- fi
-
-# snapshot package-db on cache miss
- - if [ ! -d $HOME/.cabsnap ];
- then
- echo "snapshotting package-db to build-cache";
- mkdir $HOME/.cabsnap;
- cp -a $HOME/.ghc $HOME/.cabsnap/ghc;
- cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin
installplan.txt $HOME/.cabsnap/;
- fi
+ - cabal --version
+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2>
/dev/null || echo '?')]"
+ - BENCH=${BENCH---enable-benchmarks}
+ - TEST=${TEST---enable-tests}
+ - HADDOCK=${HADDOCK-true}
+ - UNCONSTRAINED=${UNCONSTRAINED-true}
+ - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
+ - GHCHEAD=${GHCHEAD-false}
+ - travis_retry cabal update -v
+ - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
+ - rm -fv cabal.project cabal.project.local
+ # Overlay Hackage Package Index for GHC HEAD:
https://github.com/hvr/head.hackage
+ - |
+ if $GHCHEAD; then
+ sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config
+ for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed
's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /"
${HOME}/.cabal/config; done
+
+ echo 'repository head.hackage'
>> ${HOME}/.cabal/config
+ echo ' url: http://head.hackage.haskell.org/'
>> ${HOME}/.cabal/config
+ echo ' secure: True'
>> ${HOME}/.cabal/config
+ echo ' root-keys:
07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >>
${HOME}/.cabal/config
+ echo '
2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >>
${HOME}/.cabal/config
+ echo '
8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >>
${HOME}/.cabal/config
+ echo ' key-threshold: 3'
>> ${HOME}/.cabal.config
+
+ grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
+
+ cabal new-update head.hackage -v
+ fi
+ - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
+ - "printf 'packages: \".\"\\n' > cabal.project"
+ - touch cabal.project.local
+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list
--simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/
installed/' >> cabal.project.local; done; fi"
+ - cat cabal.project || true
+ - cat cabal.project.local || true
+ - if [ -f "./configure.ac" ]; then
+ (cd "." && autoreconf -i);
+ fi
+ - rm -f cabal.project.freeze
+ - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project"
--dep -j2 all
+ - rm -rf .ghc.environment.* "."/dist
+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
# Here starts the actual work to be performed for the package under test;
# any command which exits with a non-zero exit code causes the build to fail.
script:
- - cabal configure -v2 # -v2 provides useful information for debugging
- - cabal build # this builds all libraries and executables (including
tests/benchmarks)
- - cabal sdist # tests that a source-distribution can be generated
- - export SRC_TGZ=$(cabal info . | awk '{print $2 ".tar.gz";exit}') ;
- cd dist/;
- if [ -f "$SRC_TGZ" ]; then
- cabal install "$SRC_TGZ";
- else
- echo "expected '$SRC_TGZ' not found";
- exit 1;
- fi
-
-notifications:
- irc:
- channels:
- - "irc.freenode.org#haskell-lens"
- skip_join: true
- template:
- - "\x0313either\x0f/\x0306%{branch}\x0f \x0314%{commit}\x0f %{message}
\x0302\x1f%{build_url}\x0f"
+ # test that source-distributions can be generated
+ - (cd "." && cabal sdist)
+ - mv "."/dist/either-*.tar.gz ${DISTDIR}/
+ - cd ${DISTDIR} || false
+ - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
+ - "printf 'packages: either-*/*.cabal\\n' > cabal.project"
+ - touch cabal.project.local
+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list
--simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/
installed/' >> cabal.project.local; done; fi"
+ - cat cabal.project || true
+ - cat cabal.project.local || true
+
+ # build & run tests, build benchmarks
+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all
+ - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST}
${BENCH} all; fi
+
+ # cabal check
+ - (cd either-* && cabal check)
+
+ # haddock
+ - rm -rf ./dist-newstyle
+ - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else
echo "Skipping haddock generation";fi
+# REGENDATA
["-o",".travis.yml","--ghc-head","--irc-channel=irc.freenode.org#haskell-lens","--no-no-tests-no-bench","--no-unconstrained","cabal.project"]
# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/either-5/CHANGELOG.markdown
new/either-5.0.1/CHANGELOG.markdown
--- old/either-5/CHANGELOG.markdown 2017-11-21 04:04:46.000000000 +0100
+++ new/either-5.0.1/CHANGELOG.markdown 2018-07-03 14:49:45.000000000 +0200
@@ -1,3 +1,12 @@
+5.0.1 [2018.07.03]
+------------------
+* Make the `Semigroup`, `Apply`, and `Applicative` instances for `Validation`
+ lazier.
+* Make `vap` lazier in its second argument.
+* Introduce `vapm`, an even lazier version of `vap` which requires a
+ `Monoid` constraint. Also add `apm`, a counterpart for `Validation`.
+* Use `test-framework` and `QuickCheck` in the test suite.
+
5
-
* Changed the semantics of the `Validation` `Alt` and `Alternative` instances
to collect errors.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/either-5/README.markdown
new/either-5.0.1/README.markdown
--- old/either-5/README.markdown 2017-11-21 04:04:46.000000000 +0100
+++ new/either-5.0.1/README.markdown 2018-07-03 14:49:45.000000000 +0200
@@ -3,8 +3,6 @@
[](https://hackage.haskell.org/package/either)
[](http://travis-ci.org/ekmett/either)
-This provides an `Either` monad transformer that unlike `ErrorT` is
unencumbered by a constraint on its `Left` hand argument. This is needed for a
number of applications of this monad transformer, notably in
[recursion-schemes](https://github.com/ekmett/recursion-schemes).
-
Contact Information
-------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/either-5/either.cabal new/either-5.0.1/either.cabal
--- old/either-5/either.cabal 2017-11-21 04:04:46.000000000 +0100
+++ new/either-5.0.1/either.cabal 2018-07-03 14:49:45.000000000 +0200
@@ -1,6 +1,6 @@
name: either
category: Control, Monads
-version: 5
+version: 5.0.1
license: BSD3
cabal-version: >= 1.10
license-file: LICENSE
@@ -13,6 +13,16 @@
synopsis: Combinators for working with sums
description: Combinators for working with sums.
build-type: Simple
+tested-with: GHC == 7.0.4
+ , GHC == 7.2.2
+ , GHC == 7.4.2
+ , GHC == 7.6.3
+ , GHC == 7.8.4
+ , GHC == 7.10.3
+ , GHC == 8.0.2
+ , GHC == 8.2.2
+ , GHC == 8.4.3
+ , GHC == 8.6.1
extra-source-files:
.gitignore
.ghci
@@ -47,5 +57,10 @@
type: exitcode-stdio-1.0
main-is: Main.hs
hs-source-dirs: tests
- build-depends: base, either, hedgehog
+ build-depends:
+ base,
+ either,
+ test-framework >= 0.8.1.1 && < 0.9,
+ test-framework-quickcheck2 >= 0.3.0.3 && < 0.4,
+ QuickCheck >= 2.9 && < 2.12
default-language: Haskell2010
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/either-5/src/Data/Either/Validation.hs
new/either-5.0.1/src/Data/Either/Validation.hs
--- old/either-5/src/Data/Either/Validation.hs 2017-11-21 04:04:46.000000000
+0100
+++ new/either-5.0.1/src/Data/Either/Validation.hs 2018-07-03
14:49:45.000000000 +0200
@@ -23,6 +23,8 @@
, _Validation
, vap
, ealt
+ -- combinators that leak less, but require monoid constraints
+ , vapm, apm
) where
import Control.Applicative
@@ -49,10 +51,11 @@
fmap f (Success a) = Success (f a)
instance Semigroup e => Apply (Validation e) where
- Failure e1 <.> Failure e2 = Failure (e1 <> e2)
- Failure e1 <.> Success _ = Failure e1
- Success _ <.> Failure e2 = Failure e2
- Success f <.> Success a = Success (f a)
+ Failure e1 <.> b = Failure $ case b of
+ Failure e2 -> e1 <> e2
+ Success _ -> e1
+ Success _ <.> Failure e = Failure e
+ Success f <.> Success x = Success (f x)
instance Semigroup e => Applicative (Validation e) where
pure = Success
@@ -88,17 +91,15 @@
bitraverse f _ (Failure e) = Failure <$> f e
instance Semigroup e => Semigroup (Validation e a) where
+ x@Success{} <> _ = x
+ _ <> x@Success{} = x
Failure e1 <> Failure e2 = Failure (e1 <> e2)
- Failure _ <> Success a2 = Success a2
- Success a1 <> Failure _ = Success a1
- Success a1 <> Success _ = Success a1
instance Monoid e => Monoid (Validation e a) where
mempty = Failure mempty
+ x@Success{} `mappend` _ = x
+ _ `mappend` x@Success{} = x
Failure e1 `mappend` Failure e2 = Failure (e1 `mappend` e2)
- Failure _ `mappend` Success a2 = Success a2
- Success a1 `mappend` Failure _ = Success a1
- Success a1 `mappend` Success _ = Success a1
type Prism s t a b = forall p f. (Choice p, Applicative f) => p a (f b) -> p s
(f t)
@@ -148,12 +149,30 @@
{-# INLINE _Validation #-}
vap :: Semigroup m => Either m (a -> b) -> Either m a -> Either m b
-vap (Left m) (Left n) = Left (m <> n)
-vap (Left m) Right{} = Left m
+vap (Left m) b = Left $ case b of
+ Left n -> m <> n
+ Right{} -> m
vap Right{} (Left n) = Left n
vap (Right f) (Right a) = Right (f a)
{-# INLINE vap #-}
+apm :: Monoid m => Validation m (a -> b) -> Validation m a -> Validation m b
+apm (Failure m) b = Failure $ m `mappend` case b of
+ Failure n -> n
+ Success{} -> mempty
+apm Success{} (Failure n) = Failure n
+apm (Success f) (Success a) = Success (f a)
+{-# INLINE apm #-}
+
+-- lazier version of vap that can leak less, but which requires a Monoid
+vapm :: Monoid m => Either m (a -> b) -> Either m a -> Either m b
+vapm (Left m) b = Left $ m `mappend` case b of
+ Left n -> n
+ Right{} -> mempty
+vapm Right{} (Left n) = Left n
+vapm (Right f) (Right a) = Right (f a)
+{-# INLINE vapm #-}
+
ealt :: Validation e a -> Validation e a -> Validation e a
ealt Failure{} r = r
ealt (Success a) _ = Success a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/either-5/tests/Main.hs new/either-5.0.1/tests/Main.hs
--- old/either-5/tests/Main.hs 2017-11-21 04:04:46.000000000 +0100
+++ new/either-5.0.1/tests/Main.hs 2018-07-03 14:49:45.000000000 +0200
@@ -2,14 +2,33 @@
module Main where
-import Control.Applicative
-import Data.Either.Validation
-import Data.Monoid (Sum(..))
-
-import Data.Functor (void)
-import Hedgehog
-import qualified Hedgehog.Gen as Gen
-import qualified Hedgehog.Range as Range
+import Control.Applicative
+import Data.Either.Validation
+import Data.Monoid (Sum(..))
+
+import Test.QuickCheck (Property, Gen, (===), (.&&.), Arbitrary (..),
forAllShrink, oneof)
+import Test.Framework (defaultMain)
+import Test.Framework.Providers.QuickCheck2 (testProperty)
+
+
+main :: IO ()
+main = defaultMain
+ [ testProperty "identity" $ identity (<|>) empty genValSumInt
shrinkValidation
+ , testProperty "associativity" $ associativity (<|>) genValSumInt
shrinkValidation
+ ]
+
+genValSumInt :: Gen (Validation (Sum Int) (Sum Int))
+genValSumInt = genValidation
+
+genValidation :: (Arbitrary a, Arbitrary b) => Gen (Validation a b)
+genValidation = oneof
+ [ fmap Failure arbitrary
+ , fmap Success arbitrary
+ ]
+
+shrinkValidation :: (Arbitrary a, Arbitrary b) => Validation a b ->
[Validation a b]
+shrinkValidation (Success x) = Success `fmap` shrink x
+shrinkValidation (Failure x) = Failure `fmap` shrink x
-- -- empty is a neutral element
-- empty <|> u = u
@@ -17,38 +36,13 @@
-- -- (<|>) is associative
-- u <|> (v <|> w) = (u <|> v) <|> w
-genValidation :: Gen a -> Gen b -> Gen (Validation a b)
-genValidation ga gb = do
- a <- ga
- b <- gb
- Gen.choice [return $ Failure a, return $ Success b]
-
-identity :: (Eq a, Show a) => (a -> a -> a) -> a -> Gen a -> PropertyT IO ()
-identity f i gen = do
- x <- forAll gen
- f x i === x
- f i x === x
-
-assoc :: (Eq a, Show a) => (a -> a -> a) -> Gen a -> PropertyT IO ()
-assoc f gen = do
- x <- forAll gen
- y <- forAll gen
- z <- forAll gen
-
- let xy = f x y
- yz = f y z
-
- f x yz === f xy z
-
-prop_alternative :: Property
-prop_alternative = property $ do
- let genSumInt = Sum <$> Gen.int (Range.linear 0 maxBound)
- genVal = genValidation genSumInt genSumInt
- identity (<|>) empty genVal
- assoc (<|>) genVal
-
-main :: IO ()
-main =
- void $ checkParallel $ Group "Test.Either" [
- ("prop_alternative", prop_alternative)
- ]
+identity :: (Eq a, Show a) => (a -> a -> a) -> a -> Gen a -> (a -> [a]) ->
Property
+identity f i gen shr = forAllShrink gen shr $ \x ->
+ f x i === x .&&. f i x === x
+
+associativity :: (Eq a, Show a) => (a -> a -> a) -> Gen a -> (a -> [a]) ->
Property
+associativity f gen shr =
+ forAllShrink gen shr $ \x ->
+ forAllShrink gen shr $ \y ->
+ forAllShrink gen shr $ \z ->
+ f x (f y z) === f (f x y) z
