on develop help sign in
Allow witherable ==0.3.*
5bba840Oleg Grenrus
.travis.yml+2
@@ -164,6 +164,8 @@ script:
164 - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='reflex -use-template-haskell' all | color_cabal_output
164 - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='reflex -use-template-haskell' all | color_cabal_output
165 # Constraint set old-these
165 # Constraint set old-these
166 - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='these <1' all | color_cabal_output
166 - ${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
167
169
168# REGENDATA ["--config=cabal.haskell-ci","cabal.project"]
170# REGENDATA ["--config=cabal.haskell-ci","cabal.project"]
169# EOF
171# EOF
cabal.haskell-ci+3
@@ -11,3 +11,6 @@ constraint-set no-th
11
11
12constraint-set old-these
12constraint-set old-these
13 constraints: these <1
13 constraints: these <1
14+
15+constraint-set old-witherable
16+ constraints: witherable <0.3.2
reflex.cabal+1−1
@@ -74,7 +74,7 @@ library
74 time >= 1.4 && < 1.9,
74 time >= 1.4 && < 1.9,
75 transformers >= 0.5.6.0 && < 0.6,
75 transformers >= 0.5.6.0 && < 0.6,
76 unbounded-delays >= 0.1.0.0 && < 0.2,
76 unbounded-delays >= 0.1.0.0 && < 0.2,
77− witherable >= 0.2 && < 0.3
77+ witherable >= 0.2 && < 0.4
78
78
79 if flag(split-these)
79 if flag(split-these)
80 build-depends: these >= 1 && <1.1,
80 build-depends: these >= 1 && <1.1,
src/Data/AppendMap.hs+2
@@ -46,8 +46,10 @@ _unAppendMap = getMonoidalMap
46pattern AppendMap :: Map k v -> MonoidalMap k v
46pattern AppendMap :: Map k v -> MonoidalMap k v
47pattern AppendMap m = MonoidalMap m
47pattern AppendMap m = MonoidalMap m
48
48
49+#if !MIN_VERSION_witherable(0,3,2)
49instance W.Filterable (MonoidalMap k) where
50instance W.Filterable (MonoidalMap k) where
50 mapMaybe = mapMaybe
51 mapMaybe = mapMaybe
52+#endif
51
53
52-- | Deletes a key, returning 'Nothing' if the result is empty.
54-- | Deletes a key, returning 'Nothing' if the result is empty.
53nonEmptyDelete :: Ord k => k -> MonoidalMap k a -> Maybe (MonoidalMap k a)
55nonEmptyDelete :: Ord k => k -> MonoidalMap k a -> Maybe (MonoidalMap k a)