git.iko.soy/patch
on develop help sign in
Fix GHC 7.8
commite994423840c29575a4ad69115db4a8e842eacf56 authorRyan Trinkle <ryan.trinkle@gmail.com> dateMon 18 Jul 2016, 14:32 (10 years ago) parent1a920f1
2 files changed+11−14
compare with develop
unifiedsplit
src/Reflex/Dynamic/Nub.hs+2−2 src/Reflex/Spider/Internal.hs+9−12
src/Reflex/Dynamic/Nub.hs+2−2
@@ -8,11 +8,11 @@ module Reflex.Dynamic.Nub
88 , alreadyNubbedDynamic
99 ) where
1010
11+import Control.Applicative (Applicative (..))
12+import GHC.Exts
1113import Reflex.Class
1214import Reflex.Dynamic
1315
14−import GHC.Exts
15−
1616newtype NubDynamic t a = NubDynamic { unNubDynamic :: Dynamic t a }
1717
1818nubDynamic :: Reflex t => Dynamic t a -> NubDynamic t a
src/Reflex/Spider/Internal.hs+9−12
@@ -20,11 +20,6 @@
2020{-# LANGUAGE UndecidableInstances #-}
2121module Reflex.Spider.Internal (Spider, SpiderEnv (..), Global, SpiderHost, runSpiderHost, SpiderEventHandle (..), showSubscriberType, showEventType, ComputeM (..), MergeSubscribedParent (..), HasSpiderEnv (..), newSpiderEnv, SpiderPullM (..), SpiderPushM (..), ReadPhase (..)) where
2222
23−import Data.WeakBag (WeakBag, WeakBagTicket)
24−import qualified Data.WeakBag as WeakBag
25−import qualified Reflex.Class as R
26−import qualified Reflex.Host.Class as R
27−
2823import Control.Applicative
2924import Control.Concurrent
3025import Control.Exception
@@ -37,35 +32,37 @@ import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
3732import Data.Align
3833import Data.Dependent.Map (DMap, DSum (..))
3934import qualified Data.Dependent.Map as DMap
40−import Data.Foldable
35+import Data.Foldable hiding (elem, sequence_, concat)
4136import Data.Function
4237import Data.Functor.Compose
4338import Data.GADT.Compare
4439import Data.IntMap.Strict (IntMap)
4540import qualified Data.IntMap.Strict as IntMap
4641import Data.IORef
47−import Data.List
42+import Data.List hiding (foldl')
4843import Data.Maybe
49−import Data.Monoid ((<>))
44+import Data.Monoid (mempty, (<>))
5045import Data.Some (Some)
5146import qualified Data.Some as Some
5247import Data.These
5348import Data.Traversable
49+import Data.Word
5450import System.Mem.Weak
55−
56−import GHC.Base (IO (..))
5751import GHC.IORef (IORef (..))
5852import GHC.Stack
59−
6053import Control.Monad.Primitive
6154import Data.Coerce
6255import System.IO.Unsafe
6356import Unsafe.Coerce
64−
6557import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
6658import qualified Data.List.NonEmpty as NonEmpty
6759import Data.Tree (Forest, Tree (..), drawForest)
6860
61+import Data.WeakBag (WeakBag, WeakBagTicket)
62+import qualified Data.WeakBag as WeakBag
63+import qualified Reflex.Class as R
64+import qualified Reflex.Host.Class as R
65+
6966-- Note: must come last to silence warnings due to AMP on GHC < 7.10
7067import Prelude hiding (any, concat, mapM, mapM_, sequence)
7168