Merge branch 'develop' into extra-query-instances

lpsmith · lpsmith · commit 2dcfb122a9e1 · 2020-01-08T10:39:27.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,8 @@ matrix:
   include:
     - compiler: ghcjs-8.4
       addons: {"apt":{"sources":["hvr-ghc"],"packages":["cabal-install-3.0"]}}
+    - compiler: ghc-8.8.1
+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
     - compiler: ghc-8.6.5
       addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
     - compiler: ghc-8.4.4
@@ -163,7 +165,7 @@ script:
   # Constraint set no-th
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='reflex -use-template-haskell' all | color_cabal_output
   # Constraint set old-these
-  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='these <1' all | color_cabal_output
+  - if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='these <1' all | color_cabal_output ; fi
   # Constraint set old-witherable
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='witherable <0.3.2' all | color_cabal_output
 
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,11 +1,10 @@
 # Revision history for reflex
 
-## Unreleased
+## 0.6.3
+
+* `Data.WeakBag.traverse` and `Data.FastWeakBag.traverse` have been deprecated.
+  They are replaced with `Data.WeakBag.traverse_` and `Data.FastWeakBag.traverse_`, respectively.
 
-* Data.WeakBag.traverse and Data.FastWeakBag.traverse have been
-  renamed to Data.WeakBag.traverse_ and Data.FastWeakBag.traverse_
-  respectively.
-  
 * Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
 
 * Add missing `NotReady` instances:
@@ -42,16 +41,16 @@
     * Add incrementalCoercion/coerceIncremental to go with dynamicCoercion/coerceDynamic
 
 * Generalize merging functions:
-  `merge` to `mergeG`, 
-  `mergeIncremental` to `mergeIncrementalG`, 
-  `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.  
+  `merge` to `mergeG`,
+  `mergeIncremental` to `mergeIncrementalG`,
+  `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
 
 * Generalize distribute function:
     `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
 
 ## 0.6.2.0
 
-* Fix `holdDyn` so that it is lazy in its event argument  
+* Fix `holdDyn` so that it is lazy in its event argument
   These produce `DMap`s  whose values needn't be `Identity`.
 
 * Stop using the now-deprecated `*Tag` classes (e.g., `ShowTag`).
diff --git a/Quickref.md b/Quickref.md
@@ -198,15 +198,15 @@ For Events, the returned Event fires whenever the latest Event supplied by the w
 The functions mentioned above are used to create a static FRP network.
 There are additional typeclasses that can be used to modify the FRP network, to have it interact with IO action, or to introspect the building of the network.
 
-Th typeclasses and their associated annotations include:
+The typeclasses and their associated annotations include:
 
 - `PostBuild`
     Fire an Event when an FRP network has been set up.
     ```haskell
     [B]   -- Function runs in any monad supporting PostBuild
     ```
 
-- `Adjustable` 
+- `Adjustable`
     Use Events to add or remove pieces of an FRP network.
     ```haskell
     [A]   -- Function runs in any monad supporting Adjustable
@@ -271,7 +271,7 @@ Th typeclasses and their associated annotations include:
 ```haskell
 -- Run side-effecting actions in Event when it occurs; returned Event contains
 -- results. Side effects run in the (Performable m) monad which is associated with
--- the (PerformEvent t m) typeclass constraint. 
+-- the (PerformEvent t m) typeclass constraint.
 -- This allows for working with IO when a ((MonadIO (Performable m)) constraint is available.
 [P]   performEvent        :: Event (Performable m a )                 -> m (Event a)
 
@@ -295,17 +295,20 @@ Th typeclasses and their associated annotations include:
 ## Networks
 
 ```haskell
--- Functions from Reflex.Network used to deal with Dynamics/Events carrying (m a)
+-- Functions from Reflex.Adjustable / Reflex.Network used to deal with Dynamics/Events carrying (m a)
 
--- Given a Dynamic of network-creating actions, create a network that is recreated whenever the Dynamic updates. 
--- The returned Event of network results occurs when the Dynamic does. Note: Often, the type a is an Event, 
+[A]     runWithReplace :: m a -> Event t (m b) -> m (a, Event t b)
+
+-- Given a Dynamic of network-creating actions, create a network that is recreated whenever the Dynamic updates.
+-- The returned Event of network results occurs when the Dynamic does. Note: Often, the type a is an Event,
 -- in which case the return value is an Event-of-Events that would typically be flattened (via switchHold).
-[P,A]   networkView :: Dynamic (m a) -> m (Event a) 
+[P,A]   networkView :: Dynamic (m a) -> m (Event a)
 
--- Given an initial network and an Event of network-creating actions, create a network that is recreated whenever the 
--- Event fires. The returned Dynamic of network results occurs when the Event does. Note: Often, the type a is an 
+-- Given an initial network and an Event of network-creating actions, create a network that is recreated whenever the
+-- Event fires. The returned Dynamic of network results occurs when the Event does. Note: Often, the type a is an
 -- Event, in which case the return value is a Dynamic-of-Events that would typically be flattened.
-[H,A]   networkHold :: m a -> Event (m a) -> m (Dynamic a) 
+[H,A]   networkHold :: m a -> Event (m a) -> m (Dynamic a)
 
 -- Render a placeholder network to be shown while another network is not yet done building
-[P,A]   untilReady :: m a -> m b -> m (a, Event b) 
+[P,A]   untilReady :: m a -> m b -> m (a, Event b)
+```
diff --git a/cabal.haskell-ci b/cabal.haskell-ci
@@ -10,6 +10,7 @@ constraint-set no-th
   constraints: reflex -use-template-haskell
 
 constraint-set old-these
+  ghc: <8.8
   constraints: these <1
 
 constraint-set old-witherable
diff --git a/dep/reflex-platform/github.json b/dep/reflex-platform/github.json
@@ -1,7 +1,7 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-platform",
-  "branch": "develop",
-  "rev": "e7b76dd552a10916c7d8702c11292dac4f4299ea",
-  "sha256": "0s1183arrwldcs50qhzgnv94v24n9bgq6dfq64wp0a3q2nzyvgwh"
+  "branch": "master",
+  "rev": "510b990d0b11f0626afbec5fe8575b5b2395391b",
+  "sha256": "09cmahsbxr0963wq171c7j139iyzz49hramr4v9nsf684wcwkngv"
 }
diff --git a/reflex.cabal b/reflex.cabal
@@ -1,5 +1,5 @@
 Name: reflex
-Version: 0.6.2.4
+Version: 0.6.3
 Synopsis: Higher-order Functional Reactive Programming
 Description: Reflex is a high-performance, deterministic, higher-order Functional Reactive Programming system
 License: BSD3
@@ -18,7 +18,7 @@ extra-source-files:
   ChangeLog.md
 
 tested-with:
-  GHC  ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5,
+  GHC  ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1,
   GHCJS ==8.4
 
 flag use-reflex-optimizer
@@ -50,28 +50,27 @@ library
   hs-source-dirs: src
   build-depends:
     MemoTrie == 0.6.*,
-    base >= 4.9 && < 4.13,
+    base >= 4.9 && < 4.14,
     bifunctors >= 5.2 && < 5.6,
     comonad >= 5.0.4 && < 5.1,
     constraints-extras >= 0.3 && < 0.4,
     containers >= 0.6 && < 0.7,
     data-default >= 0.5 && < 0.8,
     dependent-map >= 0.3 && < 0.4,
     exception-transformers == 0.4.*,
-    profunctors >= 5.3 && < 5.5,
     lens >= 4.7 && < 5,
     monad-control >= 1.0.1 && < 1.1,
     mtl >= 2.1 && < 2.3,
     prim-uniq >= 0.1.0.1 && < 0.2,
     primitive >= 0.5 && < 0.8,
-    profunctors,
+    profunctors >= 5.3 && < 5.6,
     random == 1.1.*,
     ref-tf == 0.4.*,
     reflection == 2.1.*,
     semigroupoids >= 4.0 && < 6,
     stm >= 2.4 && < 2.6,
     syb >= 0.5 && < 0.8,
-    time >= 1.4 && < 1.9,
+    time >= 1.4 && < 1.10,
     transformers >= 0.5.6.0 && < 0.6,
     unbounded-delays >= 0.1.0.0 && < 0.2,
     witherable >= 0.3 && < 0.3.2
@@ -151,9 +150,9 @@ library
     cpp-options: -DUSE_TEMPLATE_HASKELL
     build-depends:
       dependent-sum >= 0.6 && < 0.7,
-      haskell-src-exts >= 1.16 && < 1.22,
+      haskell-src-exts >= 1.16 && < 1.23,
       haskell-src-meta >= 0.6 && < 0.9,
-      template-haskell >= 2.9 && < 2.15
+      template-haskell >= 2.9 && < 2.16
     exposed-modules:
       Reflex.Dynamic.TH
     other-extensions: TemplateHaskell
diff --git a/release.nix b/release.nix
@@ -34,6 +34,9 @@ let
                   "release.nix"
                   ".git"
                   "dist"
+                  "cabal.haskell-ci"
+                  "cabal.project"
+                  ".travis.yml"
                 ])) ./.;
               };
             })
diff --git a/src/Control/Monad/ReaderIO.hs b/src/Control/Monad/ReaderIO.hs
@@ -37,7 +37,7 @@ instance Applicative (ReaderIO e) where
 #if MIN_VERSION_base(4,10,0)
   liftA2 = liftM2
   {-# INLINE liftA2 #-}
-#endif  
+#endif
   (*>) = (>>)
   {-# INLINE (*>) #-}
 
diff --git a/src/Data/AppendMap.hs b/src/Data/AppendMap.hs
@@ -20,7 +20,7 @@ module Data.AppendMap
   , module Data.Map.Monoidal
   ) where
 
-import Prelude hiding (map, null)
+import Prelude hiding (null)
 
 import Data.Coerce
 import Data.Default
diff --git a/src/Data/Functor/Misc.hs b/src/Data/Functor/Misc.hs
@@ -53,6 +53,7 @@ import Data.Map (Map)
 import qualified Data.Map as Map
 import Data.Some (Some(Some))
 import Data.These
+import Data.Type.Equality ((:~:)(Refl))
 import Data.Typeable hiding (Refl)
 
 --------------------------------------------------------------------------------
diff --git a/src/Reflex/Class.hs b/src/Reflex/Class.hs
@@ -200,7 +200,7 @@ import Data.Dependent.Map (DMap, DSum (..))
 import qualified Data.Dependent.Map as DMap
 import Data.Functor.Compose
 import Data.Functor.Product
-import Data.GADT.Compare (GEq (..), GCompare (..), (:~:) (..))
+import Data.GADT.Compare (GEq (..), GCompare (..))
 import Data.FastMutableIntMap (PatchIntMap)
 import Data.Foldable
 import Data.Functor.Bind
@@ -215,6 +215,7 @@ import Data.Some (Some(Some))
 import Data.String
 import Data.These
 import Data.Type.Coercion
+import Data.Type.Equality ((:~:) (..))
 import Data.Witherable (Filterable(..))
 import qualified Data.Witherable as W
 import Reflex.FunctorMaybe (FunctorMaybe)
@@ -286,7 +287,8 @@ class ( MonadHold t (PushM t)
   -- | Create an 'Event' that will occur whenever the currently-selected input
   -- 'Event' occurs
   switch :: Behavior t (Event t a) -> Event t a
-  -- | Create an 'Event' that will occur whenever the input event is occurring -- and its occurrence value, another 'Event', is also occurring
+  -- | Create an 'Event' that will occur whenever the input event is occurring -- and its occurrence value, another 'Event', is also occurring.
+  --   You maybe looking for '@switchHold@ @never@' instead.
   coincidence :: Event t (Event t a) -> Event t a
   -- | Extract the 'Behavior' of a 'Dynamic'.
   current :: Dynamic t a -> Behavior t a
@@ -662,7 +664,9 @@ instance Reflex t => Monad (Behavior t) where
   a >>= f = pull $ sample a >>= sample . f
   -- Note: it is tempting to write (_ >> b = b); however, this would result in (fail x >> return y) succeeding (returning y), which violates the law that (a >> b = a >>= \_ -> b), since the implementation of (>>=) above actually will fail.  Since we can't examine 'Behavior's other than by using sample, I don't think it's possible to write (>>) to be more efficient than the (>>=) above.
   return = constant
+#if !MIN_VERSION_base(4,13,0)
   fail = error "Monad (Behavior t) does not support fail"
+#endif
 
 instance (Reflex t, Monoid a) => Monoid (Behavior t a) where
   mempty = constant mempty
diff --git a/src/Reflex/Collection.hs b/src/Reflex/Collection.hs
@@ -130,7 +130,7 @@ listWithKeyShallowDiff initialVals valsChanged mkChild = do
         Nothing -> Just Nothing
 
         -- We don't want to let spurious re-creations of items through
-        Just _  -> Nothing 
+        Just _  -> Nothing
   listHoldWithKey
       initialVals
       (attachWith (flip (Map.differenceWith relevantPatch))
diff --git a/src/Reflex/Dynamic.hs b/src/Reflex/Dynamic.hs
@@ -87,11 +87,12 @@ import Data.Align
 import Data.Dependent.Map (DMap)
 import qualified Data.Dependent.Map as DMap
 import Data.Dependent.Sum (DSum (..))
-import Data.GADT.Compare ((:~:) (..), GCompare (..), GEq (..), GOrdering (..))
+import Data.GADT.Compare (GCompare (..), GEq (..), GOrdering (..))
 import Data.Map (Map)
 import Data.Maybe
 import Data.Monoid ((<>))
 import Data.These
+import Data.Type.Equality ((:~:) (..))
 
 import Debug.Trace
 
diff --git a/src/Reflex/DynamicWriter/Class.hs b/src/Reflex/DynamicWriter/Class.hs
@@ -26,4 +26,3 @@ class (Monad m, Monoid w) => DynamicWriter t w m | m -> t w where
 
 instance DynamicWriter t w m => DynamicWriter t w (ReaderT r m) where
   tellDyn = lift . tellDyn
-
diff --git a/src/Reflex/PerformEvent/Base.hs b/src/Reflex/PerformEvent/Base.hs
@@ -141,7 +141,7 @@ hostPerformEventT a = do
           case mToPerform of
             Nothing -> return [result']
             Just toPerform -> do
-              responses <- runHostFrame $ traverseRequesterData (Identity <$>) toPerform
+              responses <- runHostFrame $ traverseRequesterData (fmap Identity) toPerform
               mrt <- readRef responseTrigger
               let followupEventTriggers = case mrt of
                     Just rt -> [rt :=> Identity responses]
diff --git a/src/Reflex/Spider/Internal.hs b/src/Reflex/Spider/Internal.hs
@@ -43,6 +43,8 @@ import Control.Monad.Reader.Class
 import Control.Monad.IO.Class
 import Control.Monad.ReaderIO
 import Control.Monad.Ref
+import Control.Monad.Fail (MonadFail)
+import qualified Control.Monad.Fail as MonadFail
 import Data.Align
 import Data.Coerce
 import Data.Dependent.Map (DMap, DSum (..))
@@ -63,6 +65,7 @@ import Data.Monoid ((<>))
 import Data.Proxy
 import Data.These
 import Data.Traversable
+import Data.Type.Equality ((:~:)(Refl))
 import Data.Witherable (Filterable, mapMaybe)
 import GHC.Exts
 import GHC.IORef (IORef (..))
@@ -972,8 +975,10 @@ instance Monad (BehaviorM x) where
   BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
   {-# INLINE return #-}
   return x = BehaviorM $ return x
+#if !MIN_VERSION_base(4,13,0)
   {-# INLINE fail #-}
   fail s = BehaviorM $ fail s
+#endif
 
 data BehaviorSubscribed x a
    = forall p. BehaviorSubscribedHold (Hold x p)
@@ -2357,8 +2362,10 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
   x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
   {-# INLINE (>>) #-}
   (>>) = (*>)
+#if !MIN_VERSION_base(4,13,0)
   {-# INLINE fail #-}
   fail _ = error "Dynamic does not support 'fail'"
+#endif
 
 {-# INLINABLE newJoinDyn #-}
 newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2637,8 +2644,14 @@ instance Monad (SpiderHost x) where
   SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
   {-# INLINABLE return #-}
   return x = SpiderHost $ return x
+#if !MIN_VERSION_base(4,13,0)
+  {-# INLINABLE fail #-}
+  fail = MonadFail.fail
+#endif
+
+instance MonadFail (SpiderHost x) where
   {-# INLINABLE fail #-}
-  fail s = SpiderHost $ fail s
+  fail s = SpiderHost $ MonadFail.fail s
 
 -- | Run an action affecting the global Spider timeline; this will be guarded by
 -- a mutex for that timeline
@@ -2660,8 +2673,10 @@ instance Monad (SpiderHostFrame x) where
   SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
   {-# INLINABLE return #-}
   return x = SpiderHostFrame $ return x
+#if !MIN_VERSION_base(4,13,0)
   {-# INLINABLE fail #-}
   fail s = SpiderHostFrame $ fail s
+#endif
 
 instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
   notReadyUntil _ = pure ()
diff --git a/test/Reflex/Bench/Focused.hs b/test/Reflex/Bench/Focused.hs
@@ -134,7 +134,7 @@ holdDynChain :: (Reflex t, MonadHold t m) => Word -> Dynamic t Word -> m (Dynami
 holdDynChain = iterM (\d -> sample (current d) >>= flip holdDyn (updated d))
 
 buildDynChain :: (Reflex t, MonadHold t m) => Word -> Dynamic t Word -> m (Dynamic t Word)
-buildDynChain = iterM (\d -> do 
+buildDynChain = iterM (\d -> do
     let b = fmap (+1) (current d)
         e = fmap (*2) (updated d)
     buildDynamic (sample b) e)
diff --git a/test/hlint.hs b/test/hlint.hs
@@ -30,16 +30,9 @@ main = do
         ]
       matchFile = and <$> sequence
         [ extension ==? ".hs"
-        , let notElem' = liftOp notElem
-          in filePath `notElem'` filePathExceptions pwd
         ]
   files <- find recurseInto matchFile (pwd </> "src") --TODO: Someday fix all hints in tests, etc.
   ideas <- fmap concat $ forM files $ \f -> do
     putStr $ "linting file " ++ drop (length pwd + 1) f ++ "... "
     runHlint f
   if null ideas then exitSuccess else exitFailure
-
-filePathExceptions :: FilePath -> [FilePath]
-filePathExceptions pwd = map (pwd </>) $
-  [ "src/Data/AppendMap.hs" -- parse error when hlint runs
-  ]

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"owner": "reflex-frp",`
`3`	`3`	`"repo": "reflex-platform",`
`4`		`- "branch": "develop",`
`5`		`- "rev": "e7b76dd552a10916c7d8702c11292dac4f4299ea",`
`6`		`- "sha256": "0s1183arrwldcs50qhzgnv94v24n9bgq6dfq64wp0a3q2nzyvgwh"`
	`4`	`+ "branch": "master",`
	`5`	`+ "rev": "510b990d0b11f0626afbec5fe8575b5b2395391b",`
	`6`	`+ "sha256": "09cmahsbxr0963wq171c7j139iyzz49hramr4v9nsf684wcwkngv"`
`7`	`7`	`}`