@@ -43,6 +43,7 @@ import Control.Monad.Reader.Class
43
43
import Control.Monad.IO.Class
44
44
import Control.Monad.ReaderIO
45
45
import Control.Monad.Ref
46
+ import qualified Control.Monad.Fail as MonadFail
46
47
import Data.Align
47
48
import Data.Coerce
48
49
import Data.Dependent.Map (DMap , DSum (.. ))
@@ -974,9 +975,13 @@ instance Monad (BehaviorM x) where
974
975
return x = BehaviorM $ return x
975
976
#if !MIN_VERSION_base(4,13,0)
976
977
{-# INLINE fail #-}
977
- fail s = BehaviorM $ fail s
978
+ fail s = MonadFail. fail
978
979
#endif
979
980
981
+ instance MonadFail (SpiderHost x ) where
982
+ {-# INLINABLE fail #-}
983
+ fail s = BehaviorM $ fail s
984
+
980
985
data BehaviorSubscribed x a
981
986
= forall p . BehaviorSubscribedHold (Hold x p )
982
987
| BehaviorSubscribedPull (PullSubscribed x a )
@@ -2641,10 +2646,12 @@ instance Monad (SpiderHost x) where
2641
2646
SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2642
2647
{-# INLINABLE return #-}
2643
2648
return x = SpiderHost $ return x
2644
- #if MIN_VERSION_base(4,13,0)
2649
+ #if !MIN_VERSION_base(4,13,0)
2650
+ {-# INLINABLE fail #-}
2651
+ fail s = MonadFail. fail
2652
+ #endif
2645
2653
2646
2654
instance MonadFail (SpiderHost x ) where
2647
- #endif
2648
2655
{-# INLINABLE fail #-}
2649
2656
fail s = SpiderHost $ fail s
2650
2657
@@ -2670,9 +2677,13 @@ instance Monad (SpiderHostFrame x) where
2670
2677
return x = SpiderHostFrame $ return x
2671
2678
#if !MIN_VERSION_base(4,13,0)
2672
2679
{-# INLINABLE fail #-}
2673
- fail s = SpiderHostFrame $ fail s
2680
+ fail s = MonadFail. fail
2674
2681
#endif
2675
2682
2683
+ instance MonadFail (SpiderHostFrame x ) where
2684
+ {-# INLINABLE fail #-}
2685
+ fail s = SpiderHostFrame $ fail s
2686
+
2676
2687
instance NotReady (SpiderTimeline x ) (SpiderHostFrame x ) where
2677
2688
notReadyUntil _ = pure ()
2678
2689
notReady = pure ()
@@ -2723,4 +2734,4 @@ instance NotReady (SpiderTimeline x) (SpiderHost x) where
2723
2734
2724
2735
instance HasSpiderTimeline x => NotReady (SpiderTimeline x ) (PerformEventT (SpiderTimeline x ) (SpiderHost x )) where
2725
2736
notReadyUntil _ = return ()
2726
- notReady = return ()
2737
+ notReady = return ()
0 commit comments