80f511d · reflex · git.iko.soy

git.iko.soy/reflex

Merge pull request #274 from endgame/these-bounds

Relax bounds on 'these', add explicit import to avoid clash

commit80f511d12e683a3a406fbe296ccab186c4a585cf authorRyan Trinkle <ryan.trinkle@gmail.com> dateWed 20 Feb 2019, 13:33 (8 years ago) parent4ac1b7c 6937019

2 files changed+2−2

compare with develop

unifiedsplit

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

reflex.cabal+1−1

@@ -60,7 +60,7 @@ library

6060 semigroups >= 0.16 && < 0.19,

6161 stm >= 2.4 && < 2.6,

6262 syb >= 0.5 && < 0.8,

63− these >= 0.4 && < 0.7.6,

63+ these >= 0.4 && < 0.7.7,

6464 time >= 1.4 && < 1.9,

6565 transformers >= 0.2,

6666 transformers-compat >= 0.3,

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

@@ -22,7 +22,7 @@ import qualified Data.Map as Map

2222import Data.Maybe

2323import Data.Semigroup (Semigroup (..), (<>))

2424import qualified Data.Set as Set

25−import Data.These

25+import Data.These (These(..))

2626import Data.Tuple

2727

2828-- | Patch a DMap with additions, deletions, and moves. Invariant: If key @k1@