5bba840 · reflex · git.iko.soy

Allow witherable ==0.3.*

commit5bba8405da85dc006de45ed5218f3d2d914c6057 authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 14 Aug 2019, 14:02 (7 years ago) parent6173df4

4 files changed+8−1

unifiedsplit

.travis.yml+2

@@ -164,6 +164,8 @@ script:

164164 - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='reflex -use-template-haskell' all | color_cabal_output

165165 # Constraint set old-these

166166 - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='these <1' all | color_cabal_output

167+ # Constraint set old-witherable

168+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='witherable <0.3.2' all | color_cabal_output

167169

168170# REGENDATA ["--config=cabal.haskell-ci","cabal.project"]

169171# EOF

cabal.haskell-ci+3

@@ -11,3 +11,6 @@ constraint-set no-th

1111

1212constraint-set old-these

1313 constraints: these <1

14+

15+constraint-set old-witherable

16+ constraints: witherable <0.3.2

reflex.cabal+1−1

@@ -74,7 +74,7 @@ library

7474 time >= 1.4 && < 1.9,

7575 transformers >= 0.5.6.0 && < 0.6,

7676 unbounded-delays >= 0.1.0.0 && < 0.2,

77− witherable >= 0.2 && < 0.3

77+ witherable >= 0.2 && < 0.4

7878

7979 if flag(split-these)

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

src/Data/AppendMap.hs+2

@@ -46,8 +46,10 @@ _unAppendMap = getMonoidalMap

4646pattern AppendMap :: Map k v -> MonoidalMap k v

4747pattern AppendMap m = MonoidalMap m

4848

49+#if !MIN_VERSION_witherable(0,3,2)

4950instance W.Filterable (MonoidalMap k) where

5051 mapMaybe = mapMaybe

52+#endif

5153

5254-- | Deletes a key, returning 'Nothing' if the result is empty.

5355nonEmptyDelete :: Ord k => k -> MonoidalMap k a -> Maybe (MonoidalMap k a)