diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal index 85137dc147c..e09fbfab8a8 100644 --- a/Cabal-syntax/Cabal-syntax.cabal +++ b/Cabal-syntax/Cabal-syntax.cabal @@ -70,7 +70,6 @@ library Distribution.Compat.Exception Distribution.Compat.Graph Distribution.Compat.Lens - Distribution.Compat.MonadFail Distribution.Compat.Newtype Distribution.Compat.NonEmptySet Distribution.Compat.Parsing diff --git a/Cabal-syntax/src/Distribution/Compat/MonadFail.hs b/Cabal-syntax/src/Distribution/Compat/MonadFail.hs deleted file mode 100644 index 4185bca592f..00000000000 --- a/Cabal-syntax/src/Distribution/Compat/MonadFail.hs +++ /dev/null @@ -1,4 +0,0 @@ --- | Compatibility layer for "Control.Monad.Fail" -module Distribution.Compat.MonadFail (Control.Monad.Fail.MonadFail (fail)) where - -import Control.Monad.Fail diff --git a/Cabal-syntax/src/Distribution/Parsec.hs b/Cabal-syntax/src/Distribution/Parsec.hs index a3f695bc95b..9b43b6e41a2 100644 --- a/Cabal-syntax/src/Distribution/Parsec.hs +++ b/Cabal-syntax/src/Distribution/Parsec.hs @@ -72,9 +72,9 @@ import Distribution.Parsec.Warning import Numeric (showIntAtBase) import Prelude () +import qualified Control.Monad.Fail as Fail import qualified Distribution.Compat.CharParsing as P import qualified Distribution.Compat.DList as DList -import qualified Distribution.Compat.MonadFail as Fail import qualified Text.Parsec as Parsec ------------------------------------------------------------------------------- diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 647cb5f1523..47753134565 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -197,7 +197,6 @@ library Distribution.Compat.Exception, Distribution.Compat.Graph, Distribution.Compat.Lens, - Distribution.Compat.MonadFail, Distribution.Compat.Newtype, Distribution.Compat.NonEmptySet, Distribution.Compat.Parsing, diff --git a/changelog.d/pr-11396.md b/changelog.d/pr-11396.md new file mode 100644 index 00000000000..6e1d8ee1d14 --- /dev/null +++ b/changelog.d/pr-11396.md @@ -0,0 +1,7 @@ +--- +synopsis: Remove Distribution.Compat.MonadFail +packages: [Cabal, Cabal-syntax] +prs: 11396 +--- + +Remove obsolete compatibility layer of `Distribution.Compat.MonadFail`, use `Control.Monad.Fail` instead.