master..021685c · monoidal-containers

git.iko.soy/monoidal-containers

on 021685c help sign in

.travis.yml+110−124

since splitsnapshots

unifiedsplit

@@ -1,153 +1,139 @@

1# This Travis job script has been generated by a script via

3−# haskell-ci 'monoidal-containers.cabal' '-o' '.travis.yml'

3+# runghc make_travis_yml_2.hs 'monoidal-containers.cabal'

4−#

5−# To regenerate the script (for example after adjusting tested-with) run

6−#

7−# haskell-ci regenerate

9# For more information, see https://github.com/haskell-CI/haskell-ci

5# For more information, see https://github.com/haskell-CI/haskell-ci

10#

11−# version: 0.10.3

12−#

13−version: ~> 1.0

14language: c

7language: c

15−os: linux

8+sudo: false

16−dist: xenial

17git:

10git:

18− # whether to recursively clone submodules

11+ submodules: false # whether to recursively clone submodules

19− submodules: false

12+

20cache:

13cache:

21 directories:

14 directories:

22 - $HOME/.cabal/packages

15 - $HOME/.cabal/packages

23 - $HOME/.cabal/store

16 - $HOME/.cabal/store

24− - $HOME/.hlint

17+

25before_cache:

18before_cache:

26− - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log

19+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log

27 # remove files that are regenerated by 'cabal update'

20 # remove files that are regenerated by 'cabal update'

28− - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*

21+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*

29− - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json

22+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json

30− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache

23+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache

31− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar

24+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar

32− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx

25+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx

26+

33− - rm -rfv $CABALHOME/packages/head.hackage

27+ - rm -rfv $HOME/.cabal/packages/head.hackage

34−jobs:

28+

29+matrix:

35 include:

30 include:

36− - compiler: ghc-8.10.2

31+ - compiler: "ghc-8.6.1"

37− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.2","cabal-install-3.2"]}}

32+ env: GHCHEAD=true

38− os: linux

33+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.6.1], sources: [hvr-ghc]}}

39− - compiler: ghc-8.8.4

40− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.4","cabal-install-3.2"]}}

41− os: linux

42− - compiler: ghc-8.6.5

43− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}

44− os: linux

45− - compiler: ghc-8.4.3

34+ - compiler: "ghc-8.4.3"

46− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.3","cabal-install-3.2"]}}

35+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

47− os: linux

36+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

48− - compiler: ghc-8.2.2

37+ - compiler: "ghc-8.2.2"

49− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.2"]}}

38+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

50− os: linux

39+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}

51− - compiler: ghc-8.0.2

40+ - compiler: "ghc-8.0.2"

52− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.2"]}}

41+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

53− os: linux

42+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}

54− - compiler: ghc-7.8.4

43+ - compiler: "ghc-7.8.4"

55− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.2"]}}

44+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

56− os: linux

45+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}

46+

47+ allow_failures:

48+ - compiler: "ghc-8.6.1"

49+

57before_install:

50before_install:

58− - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')

51+ - HC=${CC}

59− - WITHCOMPILER="-w $HC"

60− - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')

61− - HCPKG="$HC-pkg"

52+ - HCPKG=${HC/ghc/ghc-pkg}

62 - unset CC

53 - unset CC

63− - CABAL=/opt/ghc/bin/cabal

54+ - ROOTDIR=$(pwd)

64− - CABALHOME=$HOME/.cabal

55+ - mkdir -p $HOME/.local/bin

65− - export PATH="$CABALHOME/bin:$PATH"

56+ - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"

66− - TOP=$(pwd)

67− - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"

57+ - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))

68 - echo $HCNUMVER

58 - echo $HCNUMVER

69− - CABAL="$CABAL -vnormal+nowrap"

59+

70− - set -o pipefail

71− - TEST=--enable-tests

72− - BENCH=--enable-benchmarks

73− - HEADHACKAGE=false

74− - rm -f $CABALHOME/config

75− - |

76− echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config

77− echo "remote-build-reporting: anonymous" >> $CABALHOME/config

78− echo "write-ghc-environment-files: always" >> $CABALHOME/config

79− echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config

80− echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config

81− echo "world-file: $CABALHOME/world" >> $CABALHOME/config

82− echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config

83− echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config

84− echo "installdir: $CABALHOME/bin" >> $CABALHOME/config

85− echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config

86− echo "store-dir: $CABALHOME/store" >> $CABALHOME/config

87− echo "install-dirs user" >> $CABALHOME/config

88− echo " prefix: $CABALHOME" >> $CABALHOME/config

89− echo "repository hackage.haskell.org" >> $CABALHOME/config

90− echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

91install:

60install:

92− - ${CABAL} --version

61+ - cabal --version

93 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

62 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

63+ - BENCH=${BENCH---enable-benchmarks}

64+ - TEST=${TEST---enable-tests}

65+ - HADDOCK=${HADDOCK-true}

66+ - UNCONSTRAINED=${UNCONSTRAINED-true}

67+ - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}

68+ - GHCHEAD=${GHCHEAD-false}

69+ - travis_retry cabal update -v

70+ - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"

71+ - rm -fv cabal.project cabal.project.local

72+ # Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage

94 - |

73 - |

95− echo "program-default-options" >> $CABALHOME/config

74+ if $GHCHEAD; then

96− echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config

75+ sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config

97− - cat $CABALHOME/config

76+ 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

98− - rm -fv cabal.project cabal.project.local cabal.project.freeze

77+

99− - travis_retry ${CABAL} v2-update -v

78+ echo 'repository head.hackage' >> ${HOME}/.cabal/config

100− # Generate cabal.project

79+ echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config

101− - rm -rf cabal.project cabal.project.local cabal.project.freeze

80+ echo ' secure: True' >> ${HOME}/.cabal/config

102− - touch cabal.project

81+ echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config

103− - |

82+ echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config

83+ echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config

84+ echo ' key-threshold: 3' >> ${HOME}/.cabal.config

85+

86+ grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'

87+

88+ cabal new-update head.hackage -v

89+ fi

90+ - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'

104− echo "packages: ." >> cabal.project

91+ - "printf 'packages: \".\"\\n' > cabal.project"

105− - if [ $HCNUMVER -ge 80200 ] ; then echo 'package monoidal-containers' >> cabal.project ; fi

92+ - touch cabal.project.local

106− - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"

107− - |

108− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(monoidal-containers)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

93+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- monoidal-containers | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"

109 - cat cabal.project || true

94 - cat cabal.project || true

110 - cat cabal.project.local || true

95 - cat cabal.project.local || true

111− - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi

96+ - if [ -f "./configure.ac" ]; then

112− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}

97+ (cd "." && autoreconf -i);

98+ fi

113− - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"

99+ - rm -f cabal.project.freeze

114− - rm cabal.project.freeze

100+ - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all

115− - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all

116− - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all

101+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all

117−script:

102+ - rm -rf .ghc.environment.* "."/dist

118 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

103 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

119− # Packaging...

104+

120− - ${CABAL} v2-sdist all

105+# Here starts the actual work to be performed for the package under test;

121− # Unpacking...

106+# any command which exits with a non-zero exit code causes the build to fail.

107+script:

108+ # test that source-distributions can be generated

109+ - (cd "." && cabal sdist)

122− - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/

110+ - mv "."/dist/monoidal-containers-*.tar.gz ${DISTDIR}/

123 - cd ${DISTDIR} || false

111 - cd ${DISTDIR} || false

124− - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;

112+ - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

125− - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;

113+ - "printf 'packages: monoidal-containers-*/*.cabal\\n' > cabal.project"

126− - PKGDIR_monoidal_containers="$(find . -maxdepth 1 -type d -regex '.*/monoidal-containers-[0-9.]*')"

127− # Generate cabal.project

128− - rm -rf cabal.project cabal.project.local cabal.project.freeze

129− - touch cabal.project

114+ - touch cabal.project.local

130− - |

131− echo "packages: ${PKGDIR_monoidal_containers}" >> cabal.project

132− - if [ $HCNUMVER -ge 80200 ] ; then echo 'package monoidal-containers' >> cabal.project ; fi

133− - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"

134− - |

135− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(monoidal-containers)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

115+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- monoidal-containers | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"

136 - cat cabal.project || true

116 - cat cabal.project || true

137 - cat cabal.project.local || true

117 - cat cabal.project.local || true

138− # Building...

139 # this builds all libraries and executables (without tests/benchmarks)

118 # this builds all libraries and executables (without tests/benchmarks)

140− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

119+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all

141− # Building with tests and benchmarks...

120+

142 # build & run tests, build benchmarks

121 # build & run tests, build benchmarks

143− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all

122+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all

123+

144− # cabal check...

124+ # cabal check

145− - (cd ${PKGDIR_monoidal_containers} && ${CABAL} -vnormal check)

125+ - (cd monoidal-containers-* && cabal check)

126+

146− # haddock...

127+ # haddock

147− - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all

128+ - rm -rf ./dist-newstyle

129+ - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi

130+

148− # Building without installed constraints for packages in global-db...

131+ # Build without installed constraints for packages in global-db

149− - rm -f cabal.project.local

132+ - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi

150− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

133+

151−

134+ # Build with split-these set to false

135+ - cabal new-configure -f-split-these

136+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all

137+

152−# REGENDATA ("0.10.3",["monoidal-containers.cabal","-o",".travis.yml"])

138+# REGENDATA ["monoidal-containers.cabal"]

153# EOF

139# EOF

Changelog.md−4

@@ -1,9 +1,5 @@

1# Monoidal containers

3−# 0.6.0.1

4−

5− * Support semialign-1.1

6−

7# 0.6

3# 0.6

9 * Deprecates 0.5.* and reverts behavior of fromList, insert, mapKeys, etc. to match behavior in Data.Map. The only difference in behavior between Data.Map.Monoidal.MonoidalMap and Data.Map.Map is now the semigroup and monoid instances (as was the case in 0.4 and earlier).

5 * Deprecates 0.5.* and reverts behavior of fromList, insert, mapKeys, etc. to match behavior in Data.Map. The only difference in behavior between Data.Map.Monoidal.MonoidalMap and Data.Map.Map is now the semigroup and monoid instances (as was the case in 0.4 and earlier).

README.md−4

@@ -6,7 +6,3 @@ of the values to be used when resolving conflicts between keys when merging

6structures. Sadly, these are not the semantics offered by the provided

7instances. This package provides `newtypes` with an appropriate set of

8instances and utility functions to make them usable.

9−

10−## Important Note

11−

12−This library is designed to be a drop-in replacement for `Data.Map` and similar. Absolutely no other semantic changes are introduced in functions like `fromList` or `insert`. They are still left-biased like `Data.Map`'s. The only difference is in instances for `Semigroup`.

default.nix+6−4

@@ -1,15 +1,17 @@

1{ mkDerivation, aeson, base, containers, deepseq, hashable, lens

2−, newtype, semialign, semigroups, stdenv, these

2+, newtype, semialign ? null, semigroups, stdenv, these

3, unordered-containers

4}:

5mkDerivation {

6 pname = "monoidal-containers";

7− version = "0.6";

7+ version = "0.5.0.1";

8 src = ./.;

9 libraryHaskellDepends = [

10− aeson base containers deepseq hashable lens newtype semialign

10+ aeson base containers deepseq hashable lens newtype

11 semigroups these unordered-containers

12− ];

12+ ] ++ stdenv.lib.optional (semialign == null) [ semialign ];

13+ configureFlags =

14+ stdenv.lib.optional (semialign == null) [ "-f-split-these" ];

13 homepage = "http://github.com/bgamari/monoidal-containers";

15 homepage = "http://github.com/bgamari/monoidal-containers";

14 description = "Containers with monoidal accumulation";

16 description = "Containers with monoidal accumulation";

15 license = stdenv.lib.licenses.bsd3;

17 license = stdenv.lib.licenses.bsd3;

monoidal-containers.cabal+7−6

@@ -1,5 +1,5 @@

1name: monoidal-containers

2−version: 0.6.0.1

2+version: 0.6

3synopsis: Containers with monoidal accumulation

4description:

5 Containers with merging via monoidal accumulation. The 'Monoid' instances

@@ -24,7 +24,7 @@ category: Data

24build-type: Simple

25cabal-version: >=1.10

26extra-source-files: Changelog.md

27−tested-with: GHC ==7.8.4, GHC ==8.0.2, GHC ==8.2.2, GHC ==8.4.3, GHC ==8.6.5, GHC ==8.8.4, GHC ==8.10.2

27+tested-with: GHC ==7.8.4, GHC ==8.0.2, GHC ==8.2.2, GHC ==8.4.3, GHC ==8.6.1

29source-repository head

30 type: git

@@ -46,8 +46,8 @@ library

46 GeneralizedNewtypeDeriving,

47 DeriveTraversable,

48 DeriveDataTypeable

49− build-depends: base >=4.7 && <4.16,

49+ build-depends: base >=4.5 && <4.13,

50− aeson >=1.0 && <1.6,

50+ aeson >=1.0 && <1.5,

51 containers >=0.5 && <0.7,

52 deepseq >=1.3 && <1.5,

53 unordered-containers >= 0.2 && < 0.3,

@@ -57,8 +57,9 @@ library

57 semigroups >= 0.18 && < 0.20

59 if flag(split-these)

60− build-depends: these >= 1 && <1.2,

60+ build-depends: these >= 1 && <1.1,

61− semialign >=1 && <1.2

61+ semialign >=1 && <1.1

62+

62 else

63 else

63 build-depends: these >= 0.7 && <0.9

64 build-depends: these >= 0.7 && <0.9

src/Data/HashMap/Monoidal.hs−12

@@ -60,12 +60,6 @@ import Data.Hashable.Lifted (Hashable1)

60import Control.Lens

61import Control.Newtype

62import Data.Align

63−#ifdef MIN_VERSION_semialign

64−import Data.Semialign (Unalign)

65−#if MIN_VERSION_semialign(1,1,0)

66−import Data.Zip (Zip)

67−#endif

68−#endif

70-- | A 'HashMap' with monoidal accumulation

64-- | A 'HashMap' with monoidal accumulation

71newtype MonoidalHashMap k a = MonoidalHashMap { getMonoidalHashMap :: M.HashMap k a }

65newtype MonoidalHashMap k a = MonoidalHashMap { getMonoidalHashMap :: M.HashMap k a }

@@ -76,12 +70,6 @@ newtype MonoidalHashMap k a = MonoidalHashMap { getMonoidalHashMap :: M.HashMap

76#endif

70#endif

77#if MIN_VERSION_these(0,8,0)

71#if MIN_VERSION_these(0,8,0)

78 , Semialign

72 , Semialign

79−#endif

80−#ifdef MIN_VERSION_semialign

81− , Unalign

82−#if MIN_VERSION_semialign(1,1,0)

83− , Zip

84−#endif

85#endif

73#endif

86 )

74 )

src/Data/IntMap/Monoidal.hs−12

@@ -151,12 +151,6 @@ import Data.Aeson(FromJSON, ToJSON, FromJSON1, ToJSON1)

151import Data.Functor.Classes

152#endif

153import Data.Align

154−#ifdef MIN_VERSION_semialign

155−import Data.Semialign (Unalign)

156−#if MIN_VERSION_semialign(1,1,0)

157−import Data.Zip (Zip)

158−#endif

159−#endif

160

154

161-- | An 'IntMap' with monoidal accumulation

155-- | An 'IntMap' with monoidal accumulation

162newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }

156newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }

@@ -166,12 +160,6 @@ newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }

166 Data, Typeable, Align

160 Data, Typeable, Align

167#if MIN_VERSION_these(0,8,0)

161#if MIN_VERSION_these(0,8,0)

168 , Semialign

162 , Semialign

169−#endif

170−#ifdef MIN_VERSION_semialign

171− , Unalign

172−#if MIN_VERSION_semialign(1,1,0)

173− , Zip

174−#endif

175#endif

163#endif

176 )

164 )

177

165

src/Data/IntMap/Monoidal/Strict.hs+1−13

@@ -151,12 +151,6 @@ import Data.Aeson(FromJSON, ToJSON, FromJSON1, ToJSON1)

151import Data.Functor.Classes

152#endif

153import Data.Align

154−#ifdef MIN_VERSION_semialign

155−import Data.Semialign (Unalign)

156−#if MIN_VERSION_semialign(1,1,0)

157−import Data.Zip (Zip)

158−#endif

159−#endif

160

154

161-- | An 'IntMap' with monoidal accumulation

155-- | An 'IntMap' with monoidal accumulation

162newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }

156newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }

@@ -165,13 +159,7 @@ newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }

165 FromJSON, ToJSON, FromJSON1, ToJSON1,

159 FromJSON, ToJSON, FromJSON1, ToJSON1,

166 Data, Typeable, Align

160 Data, Typeable, Align

167#if MIN_VERSION_these(0,8,0)

161#if MIN_VERSION_these(0,8,0)

168− , Semialign

162+ , Semialign

169−#endif

170−#ifdef MIN_VERSION_semialign

171− , Unalign

172−#if MIN_VERSION_semialign(1,1,0)

173− , Zip

174−#endif

175#endif

163#endif

176 )

164 )

177

165

src/Data/Map/Monoidal.hs−12

@@ -151,12 +151,6 @@ import Data.Aeson(FromJSON, ToJSON, FromJSON1, ToJSON1)

151import Data.Functor.Classes

152#endif

153import Data.Align

154−#ifdef MIN_VERSION_semialign

155−import Data.Semialign (Unalign)

156−#if MIN_VERSION_semialign(1,1,0)

157−import Data.Zip (Zip)

158−#endif

159−#endif

160

154

161-- | A 'Map' with monoidal accumulation

155-- | A 'Map' with monoidal accumulation

162newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }

156newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }

@@ -166,12 +160,6 @@ newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }

166 , Data, Typeable, Align

160 , Data, Typeable, Align

167#if MIN_VERSION_these(0,8,0)

161#if MIN_VERSION_these(0,8,0)

168 , Semialign

162 , Semialign

169−#endif

170−#ifdef MIN_VERSION_semialign

171− , Unalign

172−#if MIN_VERSION_semialign(1,1,0)

173− , Zip

174−#endif

175#endif

163#endif

176 )

164 )

177

165

src/Data/Map/Monoidal/Strict.hs+2−12

@@ -151,12 +151,6 @@ import Data.Aeson(FromJSON, ToJSON, FromJSON1, ToJSON1)

151import Data.Functor.Classes

152#endif

153import Data.Align

154−#ifdef MIN_VERSION_semialign

155−import Data.Semialign (Unalign)

156−#if MIN_VERSION_semialign(1,1,0)

157−import Data.Zip (Zip)

158−#endif

159−#endif

160

154

161-- | A 'Map' with monoidal accumulation

155-- | A 'Map' with monoidal accumulation

162newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }

156newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }

@@ -166,12 +160,6 @@ newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }

166 , Data, Typeable, Align

160 , Data, Typeable, Align

167#if MIN_VERSION_these(0,8,0)

161#if MIN_VERSION_these(0,8,0)

168 , Semialign

162 , Semialign

169−#endif

170−#ifdef MIN_VERSION_semialign

171− , Unalign

172−#if MIN_VERSION_semialign(1,1,0)

173− , Zip

174−#endif

175#endif

163#endif

176 )

164 )

177

165

@@ -699,3 +687,5 @@ maxViewWithKey = coerce (M.maxViewWithKey :: M.Map k a -> Maybe ((k, a), M.Map k

699valid :: forall k a. Ord k => MonoidalMap k a -> Bool

687valid :: forall k a. Ord k => MonoidalMap k a -> Bool

700valid = coerce (M.valid :: Ord k => M.Map k a -> Bool)

688valid = coerce (M.valid :: Ord k => M.Map k a -> Bool)

701{-# INLINE valid #-}

689{-# INLINE valid #-}

690+

691+