folds 0.7.4 → 0.7.5

raw patch · 11 files changed

+211/−165 lines, 11 filesdep −hlintdep ~basedep ~mtlPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies removed: hlint

Dependency ranges changed: base, mtl

API changes (from Hackage documentation)

Files

• .ghci +0/−1
• .gitignore +17/−0
• .hlint.yaml +10/−0
• .travis.yml +163/−105
• CHANGELOG.markdown +4/−0
• HLint.hs +0/−9
• folds.cabal +12/−22
• src/Data/Fold/L'.hs +1/−1
• src/Data/Fold/M.hs +2/−2
• src/Data/Fold/R.hs +2/−2
• tests/hlint.hs +0/−23

@@ -1,1 +0,0 @@-:set -isrc -idist/build/autogen -optP-include -optPdist/build/autogen/cabal_macros.h

@@ -1,4 +1,5 @@ dist+dist-newstyle docs wiki TAGS@@ -14,3 +15,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.*

@@ -0,0 +1,10 @@+- arguments: [--cpp-define=HLINT, --cpp-ansi]++- ignore: {name: Reduce duplication}+- ignore: {name: Redundant lambda}+- ignore: {name: Use >=>}+- ignore: {name: Use const}+- ignore: {name: Eta reduce}+- ignore: {name: Avoid lambda}+- ignore: {name: Use newtype instead of data}+- ignore: {name: Avoid lambda using `infix`}

@@ -1,117 +1,175 @@-# This file has been generated -- see https://github.com/hvr/multi-ghc-travis+# This Travis job script has been generated by a script via+#+#   haskell-ci '--output=.travis.yml' '--config=cabal.haskell-ci' 'cabal.project'+#+# For more information, see https://github.com/haskell-CI/haskell-ci+#+# version: 0.5.20180830+# language: c-sudo: false-+dist: xenial+git:+  # whether to recursively clone submodules+  submodules: false+notifications:+  irc:+    channels:+      - irc.freenode.org#haskell-lens+    skip_join: true+    template:+      - "\"\\x0313folds\\x03/\\x0306%{branch}\\x03 \\x0314%{commit}\\x03 %{build_url} %{message}\"" cache:   directories:-    - $HOME/.cabsnap     - $HOME/.cabal/packages-    - $HOME/.stack-+    - $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-+  - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log+  # remove files that are regenerated by 'cabal update'+  - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*+  - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json+  - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache+  - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar+  - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx+  - rm -rfv $CABALHOME/packages/head.hackage matrix:   include:-    - env: CABALVER=1.24 GHCVER=7.6.3 BUILD=cabal-      compiler: ": #GHC 7.6.3"-      addons: {apt: {packages: [cabal-install-1.24,ghc-7.6.3,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}--    - env: CABALVER=1.24 GHCVER=7.8.4 BUILD=cabal-      compiler: ": #GHC 7.8.4"-      addons: {apt: {packages: [cabal-install-1.24,ghc-7.8.4,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}--    - env: CABALVER=1.24 GHCVER=7.10.3 BUILD=cabal-      compiler: ": #GHC 7.10.3"-      addons: {apt: {packages: [cabal-install-1.24,ghc-7.10.3,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}--    - env: CABALVER=1.24 GHCVER=8.0.2 BUILD=cabal-      compiler: ": #GHC 8.0.2"-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}--    - env: CABALVER=2.0 GHCVER=8.2.1 BUILD=cabal-      compiler: ": #GHC 8.2.1"-      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}--    - env: BUILD=stack STACK_YAML=stack-7.10.yaml STACK_OPTIONS=--skip-ghc-check-      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}--    - env: BUILD=stack STACK_YAML=stack-7.10.yaml-      os: osx--+    - compiler: ghc-8.8.1+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}+    - compiler: ghc-8.6.5+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}+    - compiler: ghc-8.4.4+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}+    - compiler: ghc-8.2.2+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}+    - compiler: ghc-8.0.2+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}+    - compiler: ghc-7.10.3+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-3.0"]}}+    - compiler: ghc-7.8.4+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-3.0"]}}+    - compiler: ghc-7.6.3+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-3.0"]}}+    - compiler: ghc-7.4.2+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.4.2","cabal-install-3.0"]}}+    - compiler: ghc-head+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-head","cabal-install-head"]}}+  allow_failures:+    - compiler: ghc-head before_install:- - unset CC- - case "$BUILD" in-     stack)-       export STACK_VERSION=0.1.3.0;-       export PATH=~/bin:$PATH;-       mkdir -p ~/bin;-       travis_retry curl -L https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION/stack-$STACK_VERSION-x86_64-$TRAVIS_OS_NAME.gz | gunzip > ~/bin/stack;-       chmod a+x ~/bin/stack;-       scripts/travis_long stack --no-terminal setup;;-     cabal)-       export HAPPYVER=1.19.5;-       export ALEXVER=3.1.4;-       export PATH=~/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:/opt/happy/$HAPPYVER/bin:/opt/alex/$ALEXVER/bin:$PATH;;-   esac+  - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')+  - WITHCOMPILER="-w $HC"+  - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')+  - HCPKG="$HC-pkg"+  - unset CC+  - CABAL=/opt/ghc/bin/cabal+  - CABALHOME=$HOME/.cabal+  - export PATH="$CABALHOME/bin:$PATH"+  - TOP=$(pwd)+  - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"+  - echo $HCNUMVER+  - CABAL="$CABAL -vnormal+nowrap+markoutput"+  - set -o pipefail+  - |+    echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }'           >> .colorful.awk+    echo 'BEGIN { state = "output"; }'                                     >> .colorful.awk+    echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }'            >> .colorful.awk+    echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }'             >> .colorful.awk+    echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk+    echo '  if (state == "cabal") {'                                       >> .colorful.awk+    echo '    print blue($0)'                                              >> .colorful.awk+    echo '  } else {'                                                      >> .colorful.awk+    echo '    print $0'                                                    >> .colorful.awk+    echo '  }'                                                             >> .colorful.awk+    echo '}'                                                               >> .colorful.awk+  - cat .colorful.awk+  - |+    color_cabal_output () {+      awk -f $TOP/.colorful.awk+    }+  - echo text | color_cabal_output install:- - case "$BUILD" in-     stack)-       scripts/travis_long stack --no-terminal $STACK_OPTIONS build --only-snapshot -j2;;-     cabal)-       echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"-       cabal --version;-       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;-       cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt;-       sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt;-       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 --enable-tests --enable-benchmarks;-       fi;-       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;;-   esac--# snapshot package-db on cache miss--# 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.+  - ${CABAL} --version+  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"+  - TEST=--enable-tests+  - BENCH=--enable-benchmarks+  - HEADHACKAGE=false+  - if [ $HCNUMVER -gt 80801 ] ; then HEADHACKAGE=true ; fi+  - rm -f $CABALHOME/config+  - |+    echo "verbose: normal +nowrap +markoutput"          >> $CABALHOME/config+    echo "remote-build-reporting: anonymous"            >> $CABALHOME/config+    echo "write-ghc-environment-files: always"          >> $CABALHOME/config+    echo "remote-repo-cache: $CABALHOME/packages"       >> $CABALHOME/config+    echo "logs-dir:          $CABALHOME/logs"           >> $CABALHOME/config+    echo "world-file:        $CABALHOME/world"          >> $CABALHOME/config+    echo "extra-prog-path:   $CABALHOME/bin"            >> $CABALHOME/config+    echo "symlink-bindir:    $CABALHOME/bin"            >> $CABALHOME/config+    echo "installdir:        $CABALHOME/bin"            >> $CABALHOME/config+    echo "build-summary:     $CABALHOME/logs/build.log" >> $CABALHOME/config+    echo "store-dir:         $CABALHOME/store"          >> $CABALHOME/config+    echo "install-dirs user"                            >> $CABALHOME/config+    echo "  prefix: $CABALHOME"                         >> $CABALHOME/config+    echo "repository hackage.haskell.org"               >> $CABALHOME/config+    echo "  url: http://hackage.haskell.org/"           >> $CABALHOME/config+  - |+    if $HEADHACKAGE; then+    echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config+    echo "repository head.hackage.ghc.haskell.org"                                        >> $CABALHOME/config+    echo "   url: https://ghc.gitlab.haskell.org/head.hackage/"                           >> $CABALHOME/config+    echo "   secure: True"                                                                >> $CABALHOME/config+    echo "   root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config+    echo "              26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config+    echo "              f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config+    echo "   key-threshold: 3"                                                            >> $CABALHOME/config+    fi+  - cat $CABALHOME/config+  - rm -fv cabal.project cabal.project.local cabal.project.freeze+  - travis_retry ${CABAL} v2-update -v+  - if [ $HCNUMVER -ge 80800 ] && [ $HCNUMVER -lt 80802 ] ; then (cd /tmp && ${CABAL} v2-install $WITHCOMPILER -j2 hlint --constraint='hlint ==2.1.*' | color_cabal_output) ; fi+  # Generate cabal.project+  - rm -rf cabal.project cabal.project.local cabal.project.freeze+  - touch cabal.project+  - |+    echo "packages: ." >> cabal.project+  - |+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(folds)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"+  - cat cabal.project || true+  - cat cabal.project.local || true+  - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi+  - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output+  - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"+  - rm  cabal.project.freeze+  - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output script:- - case "$BUILD" in-     stack)-       scripts/travis_long stack --no-terminal $STACK_OPTIONS build -j2;;-     cabal)-       cabal configure --enable-tests -v2;-       cabal build;-       cabal test;-       cabal bench || true;-       cabal sdist || true;-       SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && (cd dist && cabal install --force-reinstalls "$SRC_TGZ");;-   esac+  - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)+  # Packaging...+  - ${CABAL} v2-sdist all | color_cabal_output+  # Unpacking...+  - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/+  - cd ${DISTDIR} || false+  - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;+  - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm       '{}' \;+  - PKGDIR_folds="$(find . -maxdepth 1 -type d -regex '.*/folds-[0-9.]*')"+  # Generate cabal.project+  - rm -rf cabal.project cabal.project.local cabal.project.freeze+  - touch cabal.project+  - |+    echo "packages: ${PKGDIR_folds}" >> cabal.project+  - |+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(folds)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"+  - cat cabal.project || true+  - cat cabal.project.local || true+  # Building with tests and benchmarks...+  # build & run tests, build benchmarks+  - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output+  # Testing...+  - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output+  # HLint..+  - if [ $HCNUMVER -ge 80800 ] && [ $HCNUMVER -lt 80802 ] ; then (cd ${PKGDIR_folds} && hlint src) ; fi+  # cabal check...+  - (cd ${PKGDIR_folds} && ${CABAL} -vnormal check)+  # haddock...+  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output -notifications:-  irc:-    channels:-      - "irc.freenode.org#haskell-lens"-    skip_join: true-    template:-      - "\x0313folds\x0f/\x0306%{branch}\x0f \x0314%{commit}\x0f %{message} \x0302\x1f%{build_url}\x0f"+# REGENDATA ["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"] # EOF

@@ -1,3 +1,7 @@+0.7.5 [2019.09.27]+------------------+* Remove the `hlint` test suite in favor of running `hlint` directly on CI.+ 0.7.4 ----- * Add a library dependency on the `doctests` test suite

@@ -1,9 +0,0 @@-import "hint" HLint.HLint--ignore "Reduce duplication"-ignore "Redundant lambda"-ignore "Use >=>"-ignore "Use const"-ignore "Eta reduce"-ignore "Avoid lambda"-ignore "Use newtype instead of data"

@@ -1,6 +1,6 @@ name:          folds category:      Data, Comonads, Enumerator-version:       0.7.4+version:       0.7.5 license:       BSD3 cabal-version: >= 1.8 license-file:  LICENSE@@ -12,14 +12,22 @@ copyright:     Copyright (C) 2009-2013 Edward A. Kmett build-type:    Custom synopsis:      Beautiful Folding+tested-with:   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.4+             , GHC == 8.6.5+             , GHC == 8.8.1  extra-source-files:-  .ghci   .travis.yml   .gitignore+  .hlint.yaml   .vim.custom   CHANGELOG.markdown-  HLint.hs   README.markdown   Warning.hs @@ -46,11 +54,6 @@   default: True   manual: True --- You can disable the hlint test suite with -f-test-hlint-flag test-hlint-  default: True-  manual: True- -- You can disable the optimizations -f-optimize for faster builds flag optimize   default: True@@ -67,7 +70,7 @@     data-reify        >= 0.6   && < 0.7,     distributive      >= 0.3   && < 1,     lens              >= 4     && < 5,-    mtl               >= 2.2   && < 2.3,+    mtl               >= 2.0.1 && < 2.3,     pointed           >= 4     && < 6,     profunctors       >= 5     && < 6,     reflection        >= 1.3   && < 3,@@ -101,19 +104,6 @@    if flag(optimize)     ghc-options: -O2--test-suite hlint-  type: exitcode-stdio-1.0-  main-is: hlint.hs-  ghc-options: -w -threaded -rtsopts -with-rtsopts=-N-  hs-source-dirs: tests--  if !flag(test-hlint)-    buildable: False-  else-    build-depends:-      base,-      hlint >= 1.9.27  test-suite doctests   type:           exitcode-stdio-1.0

@@ -30,7 +30,7 @@ import Data.Profunctor.Sieve import Data.Profunctor.Unsafe import Unsafe.Coerce-import Prelude hiding (foldl)+import Prelude  -- | A strict left fold / strict Moore machine data L' a b = forall r. L' (r -> b) (r -> a -> r) r

@@ -24,7 +24,7 @@ import Data.Distributive import Data.Fold.Class import Data.Fold.Internal-import Data.Foldable hiding (sum, product)+import Data.Foldable import Data.Functor.Bind import Data.Functor.Extend import Data.Functor.Rep as Functor@@ -36,7 +36,7 @@ import Data.Proxy import Data.Reflection import Unsafe.Coerce-import Prelude hiding (sum, product, length)+import Prelude  -- | A 'foldMap' caught in amber. a.k.a. a monoidal reducer data M a b = forall m. M (m -> b) (a -> m) (m -> m -> m) m

@@ -17,7 +17,7 @@ import Control.Monad.Reader.Class import Control.Monad.Zip import Data.Distributive-import Data.Foldable hiding (sum, product)+import Data.Foldable import Data.Fold.Class import Data.Fold.Internal import Data.Functor.Extend@@ -29,7 +29,7 @@ import Data.Profunctor.Sieve import Data.Profunctor.Unsafe import Unsafe.Coerce-import Prelude hiding (foldr, sum, product, length)+import Prelude hiding (foldr)  -- | right folds / a reversed Moore machine data R a b = forall r. R (r -> b) (a -> r -> r) r

@@ -1,23 +0,0 @@--------------------------------------------------------------------------------- |--- Module      :  Main (hlint)--- Copyright   :  (C) 2013 Edward Kmett--- License     :  BSD-style (see the file LICENSE)--- Maintainer  :  Edward Kmett <ekmett@gmail.com>--- Stability   :  provisional--- Portability :  portable------ This module runs HLint on the lens source tree.-------------------------------------------------------------------------------module Main where--import Control.Monad-import Language.Haskell.HLint-import System.Environment-import System.Exit--main :: IO ()-main = do-    args <- getArgs-    hints <- hlint $ ["src", "--cpp-define=HLINT"] ++ args-    unless (null hints) exitFailure