Remove redundant Alternative constraint.

IntersectMBO · Jan 18, 2022 · 2cf99e4 · 2cf99e4
1 parent f9b929c
commit 2cf99e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/io-classes/src/Control/Monad/Class/MonadAsync.hs b/io-classes/src/Control/Monad/Class/MonadAsync.hs
@@ -203,9 +203,7 @@ newtype Concurrently m a = Concurrently { runConcurrently :: m a }
 instance Functor m => Functor (Concurrently m) where
     fmap f (Concurrently ma) = Concurrently (fmap f ma)
 
-instance ( Applicative m
-         , MonadAsync m
-         ) => Applicative (Concurrently m) where
+instance (MonadAsync m) => Applicative (Concurrently m) where
     pure = Concurrently . pure
 
     Concurrently fn <*> Concurrently as =
@@ -214,8 +212,7 @@ instance ( Applicative m
         `fmap`
         concurrently fn as
 
-instance ( Alternative m
-         , MonadAsync  m
+instance ( MonadAsync  m
          , MonadTimer  m
          ) => Alternative (Concurrently m) where
     empty = Concurrently $ forever (threadDelay 86400)

diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs
@@ -35,10 +35,9 @@ module Ouroboros.Network.Diffusion.P2P
   ) where
 
 
-import           Control.Applicative (Alternative)
 import           Control.Exception (IOException)
-import           Control.Monad.Class.MonadAsync (Async, MonadAsync)
 import qualified Control.Monad.Class.MonadAsync as Async
+import           Control.Monad.Class.MonadAsync (Async, MonadAsync)
 import           Control.Monad.Class.MonadFork
 import           Control.Monad.Class.MonadSTM.Strict
 import           Control.Monad.Class.MonadThrow
@@ -555,8 +554,7 @@ runM
     :: forall m ntnFd ntnAddr ntnVersion ntnVersionData
                 ntcFd ntcAddr ntcVersion ntcVersionData
                 resolver resolverError.
-       ( Alternative      m
-       , MonadAsync       m
+       ( MonadAsync       m
        , MonadEvaluate    m
        , MonadFork        m
        , MonadLabelledSTM m

diff --git a/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node.hs b/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node.hs
@@ -26,7 +26,6 @@ module Test.Ouroboros.Network.Diffusion.Node
   , UseLedgerAfter (..)
   ) where
 
-import           Control.Applicative (Alternative)
 import           Control.Monad.Class.MonadAsync
 import           Control.Monad.Class.MonadFork
 import           Control.Monad.Class.MonadST
@@ -126,8 +125,7 @@ data Arguments m = Arguments
 type ResolverException = SomeException
 
 run :: forall s resolver m.
-       ( Alternative      m
-       , MonadAsync       m
+       ( MonadAsync       m
        , MonadEvaluate    m
        , MonadFork        m
        , MonadLabelledSTM m