git.iko.soy/obelisk
on master help sign in
Merge pull request #387 from obsidiansystems/ae-trim-instances
181b321Ali Abrar
lib/route/src/Obelisk/Route/Frontend.hs+6−15
compare with master
unifiedsplit
@@ -176,19 +176,13 @@ instance (Monad m, MonadQuery t vs m) => MonadQuery t vs (RoutedT t r m) where
176 askQueryResult = lift askQueryResult
176 askQueryResult = lift askQueryResult
177 queryIncremental = lift . queryIncremental
177 queryIncremental = lift . queryIncremental
178
178
179−instance (Monad m, RouteToUrl r m) => RouteToUrl r (QueryT t q m) where
179+instance (Monad m, RouteToUrl r m) => RouteToUrl r (QueryT t q m)
180− askRouteToUrl = lift askRouteToUrl
181
180
182−instance (Monad m, SetRoute t r m) => SetRoute t r (QueryT t q m) where
181+instance (Monad m, SetRoute t r m) => SetRoute t r (QueryT t q m)
183− setRoute = lift . setRoute
184− modifyRoute = lift . modifyRoute
185
182
186−instance (Monad m, RouteToUrl r m) => RouteToUrl r (EventWriterT t w m) where
183+instance (Monad m, RouteToUrl r m) => RouteToUrl r (EventWriterT t w m)
187− askRouteToUrl = lift askRouteToUrl
188
184
189−instance (Monad m, SetRoute t r m) => SetRoute t r (EventWriterT t w m) where
185+instance (Monad m, SetRoute t r m) => SetRoute t r (EventWriterT t w m)
190− setRoute = lift . setRoute
191− modifyRoute = lift . modifyRoute
192
186
193runRoutedT :: RoutedT t r m a -> Dynamic t r -> m a
187runRoutedT :: RoutedT t r m a -> Dynamic t r -> m a
194runRoutedT = runReaderT . unRoutedT
188runRoutedT = runReaderT . unRoutedT
@@ -319,9 +313,7 @@ instance Requester t m => Requester t (SetRouteT t r m) where
319 requesting = SetRouteT . requesting
313 requesting = SetRouteT . requesting
320 requesting_ = SetRouteT . requesting_
314 requesting_ = SetRouteT . requesting_
321
315
322−instance (Monad m, SetRoute t r m) => SetRoute t r (RequesterT t req rsp m) where
316+instance (Monad m, SetRoute t r m) => SetRoute t r (RequesterT t req rsp m)
323− setRoute = lift . setRoute
324− modifyRoute = lift . modifyRoute
325
317
326#ifndef ghcjs_HOST_OS
318#ifndef ghcjs_HOST_OS
327deriving instance MonadJSM m => MonadJSM (SetRouteT t r m)
319deriving instance MonadJSM m => MonadJSM (SetRouteT t r m)
@@ -383,8 +375,7 @@ instance (Monad m, RouteToUrl r m) => RouteToUrl r (RoutedT t r' m) where
383
375
384instance (Monad m, RouteToUrl r m) => RouteToUrl r (ReaderT r' m) where
376instance (Monad m, RouteToUrl r m) => RouteToUrl r (ReaderT r' m) where
385
377
386−instance (Monad m, RouteToUrl r m) => RouteToUrl r (RequesterT t req rsp m) where
378+instance (Monad m, RouteToUrl r m) => RouteToUrl r (RequesterT t req rsp m)
387− askRouteToUrl = lift askRouteToUrl
388
379
389instance HasJSContext m => HasJSContext (RouteToUrlT r m) where
380instance HasJSContext m => HasJSContext (RouteToUrlT r m) where
390 type JSContextPhantom (RouteToUrlT r m) = JSContextPhantom m
381 type JSContextPhantom (RouteToUrlT r m) = JSContextPhantom m