From 08fba093bb0b9e186cad9e35e3f58397456c7b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9cate?= Date: Thu, 7 Jan 2021 22:53:12 +0100 Subject: Remove -XMonadFailDesugaring references --- compiler/GHC/Driver/Session.hs | 2 -- compiler/GHC/Rename/Expr.hs | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'compiler') diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs index 8e92fc974f..64c945a7cf 100644 --- a/compiler/GHC/Driver/Session.hs +++ b/compiler/GHC/Driver/Session.hs @@ -3647,8 +3647,6 @@ xFlagsDeps = [ flagSpec "LinearTypes" LangExt.LinearTypes, flagSpec "MagicHash" LangExt.MagicHash, flagSpec "MonadComprehensions" LangExt.MonadComprehensions, - depFlagSpec "MonadFailDesugaring" LangExt.MonadFailDesugaring - "MonadFailDesugaring is now the default behavior", flagSpec "MonoLocalBinds" LangExt.MonoLocalBinds, depFlagSpecCond "MonoPatBinds" LangExt.MonoPatBinds id diff --git a/compiler/GHC/Rename/Expr.hs b/compiler/GHC/Rename/Expr.hs index bfa773ed9f..55618978a5 100644 --- a/compiler/GHC/Rename/Expr.hs +++ b/compiler/GHC/Rename/Expr.hs @@ -780,10 +780,9 @@ exhaustive list). How we deal with pattern match failure is context-dependent. entirely. So, for list comprehensions, the fail function is set to 'Nothing' for clarity. - * In the case of monadic contexts (e.g. monad comprehensions, do, and mdo - expressions) we want pattern match failure to be desugared to the appropriate - 'fail' function (either that of Monad or MonadFail, depending on whether - -XMonadFailDesugaring is enabled.) +* In the case of monadic contexts (e.g. monad comprehensions, do, and mdo + expressions) we want pattern match failure to be desugared to the + 'fail' function (from MonadFail type class). At one point we failed to make this distinction, leading to #11216. -} -- cgit v1.2.1