7cfa682 · reflex · git.iko.soy

git.iko.soy/reflex

Update reflex for newer base libraries.

commit7cfa6824c3655b432df4bb888b039c829fa2adc2 authordavean <davean@xkcd.com> dateSun 14 Oct 2018, 14:54 (8 years ago) parent15c99fc

3 files changed+7−6

compare with develop

unifiedsplit

reflex.cabal+4−4 src/Data/AppendMap.hs+2−1 src/Reflex/Patch/MapWithMove.hs+1−1

reflex.cabal+4−4

@@ -37,10 +37,10 @@ library

3737 hs-source-dirs: src

3838 build-depends:

3939 MemoTrie == 0.6.*,

40− base >= 4.7 && < 4.12,

40+ base >= 4.7 && < 4.13,

4141 bifunctors >= 5.2 && < 5.6,

4242 comonad,

43− containers == 0.5.*,

43+ containers >= 0.5 && < 0.7,

4444 data-default >= 0.5 && < 0.8,

4545 dependent-map >= 0.2.4 && < 0.3,

4646 exception-transformers == 0.4.*,

@@ -55,7 +55,7 @@ library

5555 reflection == 2.1.*,

5656 semigroupoids >= 4.0 && < 6,

5757 semigroups >= 0.16 && < 0.19,

58− stm == 2.4.*,

58+ stm >= 2.4 && < 2.6,

5959 syb >= 0.5 && < 0.8,

6060 these >= 0.4 && < 0.8,

6161 time >= 1.4 && < 1.9,

@@ -130,7 +130,7 @@ library

130130 dependent-sum >= 0.3 && < 0.5,

131131 haskell-src-exts >= 1.16 && < 1.21,

132132 haskell-src-meta >= 0.6 && < 0.9,

133− template-haskell >= 2.9 && < 2.14

133+ template-haskell >= 2.9 && < 2.15

134134 exposed-modules:

135135 Reflex.Dynamic.TH

136136 other-extensions: TemplateHaskell

src/Data/AppendMap.hs+2−1

@@ -26,7 +26,8 @@ import Prelude hiding (map, null)

2626import Data.Coerce

2727import Data.Default

2828import Data.Map (Map)

29−import qualified Data.Map as Map

29+import qualified Data.Map as Map hiding (showTree, showTreeWith)

30+import qualified Data.Map.Internal.Debug as Map (showTree, showTreeWith)

3031import Data.Map.Monoidal

3132import Reflex.Class (FunctorMaybe (..))

3233import Reflex.Patch (Additive, Group (..))

src/Reflex/Patch/MapWithMove.hs+1−1

@@ -143,7 +143,7 @@ patchThatChangesMap oldByIndex newByIndex = patch

143143 putRemainingKeys $ Set.delete k fromKs

144144 return $ NodeInfo (From_Move k) $ Just undefined -- There's an existing value, and it's here, so no patch necessary

145145 else do

146− Just (fromK, remainingKeys) <- return $ Set.minView fromKs -- There's an existing value, but it's not here; move it here

146+ (fromK, remainingKeys) <- return . fromJust $ Set.minView fromKs -- There's an existing value, but it's not here; move it here

147147 putRemainingKeys remainingKeys

148148 return $ NodeInfo (From_Move fromK) $ Just undefined

149149 Map.traverseWithKey f newByIndex