Merge branch 'develop' into unconditional-th

Author: ali-abrar

reflex.cabal

@@ -78,7 +78,6 @@ library
     dependent-sum >= 0.6 && < 0.8,
     exceptions >= 0.10 && < 0.11,
     exception-transformers >= 0.4 && < 0.5,
-    lens >= 4.7 && < 5.4,
     mmorph >= 1.0 && < 1.3,
     monad-control >= 1.0.1 && < 1.1,
     mtl >= 2.1 && < 2.4,

src/Reflex/PerformEvent/Base.hs

@@ -31,7 +31,6 @@ import Reflex.PerformEvent.Class
 import Reflex.Requester.Base
 import Reflex.Requester.Class
 
-import Control.Lens
 import Control.Monad.Catch (MonadMask, MonadThrow, MonadCatch)
 import Control.Monad.Exception
 import Control.Monad.Fix

src/Reflex/Requester/Class.hs

@@ -40,6 +40,8 @@ class (Reflex t, Monad m) => Requester t m | m -> t where
   type Response m :: Type -> Type
   -- | Emit a request whenever the given 'Event' fires, and return responses in
   -- the resulting 'Event'.
+  --
+  -- Semantically, the response event occurs at a later time than the request event.
   requesting :: Event t (Request m a) -> m (Event t (Response m a))
   -- | Emit a request whenever the given 'Event' fires, and ignore all responses.
   requesting_ :: Event t (Request m a) -> m ()

src/Reflex/Time.hs

@@ -8,7 +8,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TemplateHaskell #-}
+
 -- |
 -- Module:
 --   Reflex.Time
@@ -24,7 +24,6 @@ import Reflex.TriggerEvent.Class
 
 import Control.Concurrent
 import qualified Control.Concurrent.Thread.Delay as Concurrent
-import Control.Lens hiding ((|>))
 import Control.Monad
 import Control.Monad.Fix
 import Control.Monad.IO.Class
@@ -363,4 +362,14 @@ throttleBatchWithLag lag e = do
       delayed <- lag (void outE)
   return outE
 
-makeLensesWith (lensRules & simpleLenses .~ True) ''TickInfo
+tickInfo_lastUTC :: Functor f => (UTCTime -> f UTCTime) -> TickInfo -> f TickInfo
+tickInfo_lastUTC f (TickInfo x1 x2 x3) = (\y -> TickInfo y x2 x3) <$> f x1
+{-# INLINE tickInfo_lastUTC #-}
+
+tickInfo_n :: Functor f => (Integer  -> f Integer ) -> TickInfo -> f TickInfo
+tickInfo_n f (TickInfo x1 x2 x3) = (\y -> TickInfo x1 y x3) <$> f x2
+{-# INLINE tickInfo_n #-}
+
+tickInfo_alreadyElapsed :: Functor f => (NominalDiffTime -> f NominalDiffTime) -> TickInfo -> f TickInfo
+tickInfo_alreadyElapsed f (TickInfo x1 x2 x3) = TickInfo x1 x2 <$> f x3
+{-# INLINE tickInfo_alreadyElapsed #-}