[commit: ghc] master: Fix double MaybeT instance (2cfa5db)
git at git.haskell.org
git at git.haskell.org
Tue Dec 8 10:45:56 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/2cfa5db47dc16caf7cb7be5aed2fbe843cd784a8/ghc
>---------------------------------------------------------------
commit 2cfa5db47dc16caf7cb7be5aed2fbe843cd784a8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Tue Dec 8 11:45:38 2015 +0100
Fix double MaybeT instance
This is a fixup to fd3b845c01aa26b6e5cd12c00af59e5468e21b1b
which didn't take into account 09333313f32be975faf9158fcd3648489d78ad82
having pushed as well.
>---------------------------------------------------------------
2cfa5db47dc16caf7cb7be5aed2fbe843cd784a8
compiler/main/DynFlags.hs | 4 ----
1 file changed, 4 deletions(-)
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index c492a01..bceb51f 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -180,7 +180,6 @@ import Control.Monad
import Control.Monad.Trans.Class
import Control.Monad.Trans.Writer
import Control.Monad.Trans.Reader
-import qualified Control.Monad.Trans.Maybe as CMT
#if MIN_VERSION_transformers(4,0,0)
import Control.Monad.Trans.Except
#endif
@@ -937,9 +936,6 @@ instance (Monad m, HasDynFlags m) => HasDynFlags (ReaderT a m) where
getDynFlags = lift getDynFlags
instance (Monad m, HasDynFlags m) => HasDynFlags (MaybeT m) where
- getDynFlags = liftMaybeT getDynFlags
-
-instance (Monad m, HasDynFlags m) => HasDynFlags (CMT.MaybeT m) where
getDynFlags = lift getDynFlags
#if MIN_VERSION_transformers(4,0,0)
More information about the ghc-commits
mailing list