Update reflex for newer base libraries.

Author: davean

reflex.cabal

@@ -37,10 +37,10 @@ library
   hs-source-dirs: src
   build-depends:
     MemoTrie == 0.6.*,
-    base >= 4.7 && < 4.12,
+    base >= 4.7 && < 4.13,
     bifunctors >= 5.2 && < 5.6,
     comonad,
-    containers == 0.5.*,
+    containers >= 0.5 && < 0.7,
     data-default >= 0.5 && < 0.8,
     dependent-map >= 0.2.4 && < 0.3,
     exception-transformers == 0.4.*,
@@ -55,7 +55,7 @@ library
     reflection == 2.1.*,
     semigroupoids >= 4.0 && < 6,
     semigroups >= 0.16 && < 0.19,
-    stm == 2.4.*,
+    stm >= 2.4 && < 2.6,
     syb >= 0.5 && < 0.8,
     these >= 0.4 && < 0.8,
     time >= 1.4 && < 1.9,
@@ -130,7 +130,7 @@ library
       dependent-sum >= 0.3 && < 0.5,
       haskell-src-exts >= 1.16 && < 1.21,
       haskell-src-meta >= 0.6 && < 0.9,
-      template-haskell >= 2.9 && < 2.14
+      template-haskell >= 2.9 && < 2.15
     exposed-modules:
       Reflex.Dynamic.TH
     other-extensions: TemplateHaskell

src/Data/AppendMap.hs

@@ -26,7 +26,8 @@ import Prelude hiding (map, null)
 import Data.Coerce
 import Data.Default
 import Data.Map (Map)
-import qualified Data.Map as Map
+import qualified Data.Map as Map hiding (showTree, showTreeWith)
+import qualified Data.Map.Internal.Debug as Map (showTree, showTreeWith)
 import Data.Map.Monoidal
 import Reflex.Class (FunctorMaybe (..))
 import Reflex.Patch (Additive, Group (..))

src/Reflex/Patch/MapWithMove.hs

@@ -143,7 +143,7 @@ patchThatChangesMap oldByIndex newByIndex = patch
                       putRemainingKeys $ Set.delete k fromKs
                       return $ NodeInfo (From_Move k) $ Just undefined -- There's an existing value, and it's here, so no patch necessary
                     else do
-                      Just (fromK, remainingKeys) <- return $ Set.minView fromKs -- There's an existing value, but it's not here; move it here
+                      (fromK, remainingKeys) <- return . fromJust $ Set.minView fromKs -- There's an existing value, but it's not here; move it here
                       putRemainingKeys remainingKeys
                       return $ NodeInfo (From_Move fromK) $ Just undefined
           Map.traverseWithKey f newByIndex