git.iko.soy/patch
on develop help sign in
Update reflex for newer base libraries.
7cfa682davean
reflex.cabal+4−4
compare with develop
unifiedsplit
@@ -37,10 +37,10 @@ library
37 hs-source-dirs: src
37 hs-source-dirs: src
38 build-depends:
38 build-depends:
39 MemoTrie == 0.6.*,
39 MemoTrie == 0.6.*,
40− base >= 4.7 && < 4.12,
40+ base >= 4.7 && < 4.13,
41 bifunctors >= 5.2 && < 5.6,
41 bifunctors >= 5.2 && < 5.6,
42 comonad,
42 comonad,
43− containers == 0.5.*,
43+ containers >= 0.5 && < 0.7,
44 data-default >= 0.5 && < 0.8,
44 data-default >= 0.5 && < 0.8,
45 dependent-map >= 0.2.4 && < 0.3,
45 dependent-map >= 0.2.4 && < 0.3,
46 exception-transformers == 0.4.*,
46 exception-transformers == 0.4.*,
@@ -55,7 +55,7 @@ library
55 reflection == 2.1.*,
55 reflection == 2.1.*,
56 semigroupoids >= 4.0 && < 6,
56 semigroupoids >= 4.0 && < 6,
57 semigroups >= 0.16 && < 0.19,
57 semigroups >= 0.16 && < 0.19,
58− stm == 2.4.*,
58+ stm >= 2.4 && < 2.6,
59 syb >= 0.5 && < 0.8,
59 syb >= 0.5 && < 0.8,
60 these >= 0.4 && < 0.8,
60 these >= 0.4 && < 0.8,
61 time >= 1.4 && < 1.9,
61 time >= 1.4 && < 1.9,
@@ -130,7 +130,7 @@ library
130 dependent-sum >= 0.3 && < 0.5,
130 dependent-sum >= 0.3 && < 0.5,
131 haskell-src-exts >= 1.16 && < 1.21,
131 haskell-src-exts >= 1.16 && < 1.21,
132 haskell-src-meta >= 0.6 && < 0.9,
132 haskell-src-meta >= 0.6 && < 0.9,
133− template-haskell >= 2.9 && < 2.14
133+ template-haskell >= 2.9 && < 2.15
134 exposed-modules:
134 exposed-modules:
135 Reflex.Dynamic.TH
135 Reflex.Dynamic.TH
136 other-extensions: TemplateHaskell
136 other-extensions: TemplateHaskell
src/Data/AppendMap.hs+2−1
@@ -26,7 +26,8 @@ import Prelude hiding (map, null)
26import Data.Coerce
26import Data.Coerce
27import Data.Default
27import Data.Default
28import Data.Map (Map)
28import 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)
30import Data.Map.Monoidal
31import Data.Map.Monoidal
31import Reflex.Class (FunctorMaybe (..))
32import Reflex.Class (FunctorMaybe (..))
32import Reflex.Patch (Additive, Group (..))
33import Reflex.Patch (Additive, Group (..))
src/Reflex/Patch/MapWithMove.hs+1−1
@@ -143,7 +143,7 @@ patchThatChangesMap oldByIndex newByIndex = patch
143 putRemainingKeys $ Set.delete k fromKs
143 putRemainingKeys $ Set.delete k fromKs
144 return $ NodeInfo (From_Move k) $ Just undefined -- There's an existing value, and it's here, so no patch necessary
144 return $ NodeInfo (From_Move k) $ Just undefined -- There's an existing value, and it's here, so no patch necessary
145 else do
145 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
147 putRemainingKeys remainingKeys
147 putRemainingKeys remainingKeys
148 return $ NodeInfo (From_Move fromK) $ Just undefined
148 return $ NodeInfo (From_Move fromK) $ Just undefined
149 Map.traverseWithKey f newByIndex
149 Map.traverseWithKey f newByIndex