[commit: ghc] master: base: Remove `Monad(fail)` method and reexport `MonadFail(fail)` instead (ab51bee)

git at git.haskell.org git at git.haskell.org
Fri Mar 22 22:34:17 UTC 2019


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ab51bee40c82cd552bcf13e24b67d43f3b8d25f3/ghc

>---------------------------------------------------------------

commit ab51bee40c82cd552bcf13e24b67d43f3b8d25f3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Nov 10 01:12:52 2018 +0100

    base: Remove `Monad(fail)` method and reexport `MonadFail(fail)` instead
    
    As per https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail
    
    Coauthored-by: Ben Gamari <ben at well-typed.com>


>---------------------------------------------------------------

ab51bee40c82cd552bcf13e24b67d43f3b8d25f3
 compiler/ghc.cabal.in                              |   1 -
 compiler/main/DynFlags.hs                          |  12 +--
 compiler/prelude/PrelNames.hs                      |  14 +--
 compiler/rename/RnExpr.hs                          |  17 ++--
 compiler/rename/RnSource.hs                        |  43 ---------
 compiler/simplCore/SimplCore.hs                    |  14 +--
 compiler/typecheck/TcMatches.hs                    |  42 +-------
 ghc/ghc-bin.cabal.in                               |   1 -
 libraries/base/Control/Monad.hs                    |   4 +-
 libraries/base/Control/Monad/ST/Lazy/Imp.hs        |   3 -
 libraries/base/GHC/Base.hs                         |  16 ---
 libraries/base/GHC/Conc/Sync.hs                    |   2 +-
 libraries/base/GHC/TopHandler.hs                   |   2 +-
 libraries/base/Prelude.hs                          |   3 +-
 libraries/base/System/IO.hs                        |   4 +-
 libraries/base/Text/ParserCombinators/ReadP.hs     |   3 -
 libraries/base/Text/ParserCombinators/ReadPrec.hs  |   1 -
 libraries/base/base.cabal                          |   4 +-
 libraries/hpc                                      |   2 +-
 testsuite/tests/ado/ado004.stderr                  |   2 +-
 .../backpack/cabal/T16219/backpack-issue.cabal     |   8 +-
 .../tests/backpack/should_compile/bkp16.stderr     |   4 +-
 .../tests/backpack/should_fail/bkpfail16.stderr    |   4 +-
 .../tests/backpack/should_fail/bkpfail17.stderr    |   4 +-
 .../tests/backpack/should_fail/bkpfail19.stderr    |   4 +-
 testsuite/tests/deSugar/should_run/dsrun010.hs     |   6 +-
 .../tests/dependent/should_compile/T14729.stderr   |   2 +-
 .../tests/dependent/should_compile/T15743.stderr   |   2 +-
 .../tests/dependent/should_compile/T15743e.stderr  |   2 +-
 testsuite/tests/determinism/determ017/A.hs         |   8 +-
 .../tests/determinism/determ021/determ021.stdout   |   4 +-
 testsuite/tests/driver/json2.stderr                |   2 +-
 testsuite/tests/ghci/scripts/T4175.stdout          |   1 +
 testsuite/tests/ghci/scripts/ghci008.stdout        |   4 +-
 testsuite/tests/ghci/scripts/ghci011.stdout        |   1 +
 testsuite/tests/ghci/scripts/ghci025.stdout        |   1 -
 .../indexed-types/should_compile/T15711.stderr     |   2 +-
 .../indexed-types/should_compile/T15852.stderr     |   2 +-
 .../indexed-types/should_compile/T3017.stderr      |   2 +-
 testsuite/tests/monadfail/MonadFailErrors.hs       |   2 -
 testsuite/tests/monadfail/MonadFailErrors.stderr   |   8 +-
 testsuite/tests/monadfail/MonadFailWarnings.hs     | 107 ---------------------
 testsuite/tests/monadfail/MonadFailWarnings.stderr |  47 ---------
 .../tests/monadfail/MonadFailWarningsDisabled.hs   | 100 -------------------
 .../MonadFailWarningsWithRebindableSyntax.hs       |  14 ---
 .../MonadFailWarningsWithRebindableSyntax.stderr   |   5 -
 testsuite/tests/monadfail/all.T                    |   3 -
 .../tests/partial-sigs/should_compile/ADT.stderr   |   2 +-
 .../partial-sigs/should_compile/AddAndOr1.stderr   |   2 +-
 .../partial-sigs/should_compile/AddAndOr2.stderr   |   2 +-
 .../partial-sigs/should_compile/AddAndOr3.stderr   |   2 +-
 .../partial-sigs/should_compile/AddAndOr4.stderr   |   2 +-
 .../partial-sigs/should_compile/AddAndOr5.stderr   |   2 +-
 .../partial-sigs/should_compile/AddAndOr6.stderr   |   2 +-
 .../partial-sigs/should_compile/BoolToBool.stderr  |   2 +-
 .../should_compile/DataFamilyInstanceLHS.stderr    |   2 +-
 .../should_compile/Defaulting1MROn.stderr          |   2 +-
 .../should_compile/Defaulting2MROff.stderr         |   2 +-
 .../should_compile/Defaulting2MROn.stderr          |   2 +-
 .../partial-sigs/should_compile/Either.stderr      |   2 +-
 .../should_compile/EqualityConstraint.stderr       |   2 +-
 .../tests/partial-sigs/should_compile/Every.stderr |   2 +-
 .../partial-sigs/should_compile/EveryNamed.stderr  |   2 +-
 .../should_compile/ExpressionSig.stderr            |   2 +-
 .../should_compile/ExpressionSigNamed.stderr       |   2 +-
 .../should_compile/ExtraConstraints1.stderr        |   2 +-
 .../should_compile/ExtraConstraints2.stderr        |   2 +-
 .../should_compile/ExtraConstraints3.stderr        |   4 +-
 .../should_compile/ExtraNumAMROff.stderr           |   2 +-
 .../should_compile/ExtraNumAMROn.stderr            |   2 +-
 .../partial-sigs/should_compile/Forall1.stderr     |   2 +-
 .../partial-sigs/should_compile/GenNamed.stderr    |   2 +-
 .../partial-sigs/should_compile/HigherRank1.stderr |   2 +-
 .../partial-sigs/should_compile/HigherRank2.stderr |   2 +-
 .../should_compile/LocalDefinitionBug.stderr       |   2 +-
 .../partial-sigs/should_compile/Meltdown.stderr    |   2 +-
 .../should_compile/MonoLocalBinds.stderr           |   2 +-
 .../partial-sigs/should_compile/NamedTyVar.stderr  |   2 +-
 .../NamedWildcardInDataFamilyInstanceLHS.stderr    |   2 +-
 .../NamedWildcardInTypeFamilyInstanceLHS.stderr    |   2 +-
 .../should_compile/ParensAroundContext.stderr      |   2 +-
 .../partial-sigs/should_compile/PatBind.stderr     |   2 +-
 .../partial-sigs/should_compile/PatBind2.stderr    |   2 +-
 .../partial-sigs/should_compile/PatternSig.stderr  |   2 +-
 .../partial-sigs/should_compile/Recursive.stderr   |   2 +-
 .../should_compile/ScopedNamedWildcards.stderr     |   2 +-
 .../should_compile/ScopedNamedWildcardsGood.stderr |   2 +-
 .../partial-sigs/should_compile/ShowNamed.stderr   |   2 +-
 .../partial-sigs/should_compile/SimpleGen.stderr   |   2 +-
 .../partial-sigs/should_compile/SkipMany.stderr    |   2 +-
 .../should_compile/SomethingShowable.stderr        |   2 +-
 .../should_compile/TypeFamilyInstanceLHS.stderr    |   2 +-
 .../partial-sigs/should_compile/Uncurry.stderr     |   2 +-
 .../should_compile/UncurryNamed.stderr             |   2 +-
 .../WarningWildcardInstantiations.stderr           |   2 +-
 testsuite/tests/perf/compiler/T3064.hs             |   2 +
 testsuite/tests/polykinds/T15592.stderr            |   2 +-
 testsuite/tests/polykinds/T15592b.stderr           |   2 +-
 testsuite/tests/profiling/should_run/T3001-2.hs    |   1 +
 testsuite/tests/programs/galois_raytrace/Eval.hs   |   3 +-
 testsuite/tests/quasiquotation/qq005/Expr.hs       |   2 +-
 testsuite/tests/quasiquotation/qq006/Expr.hs       |   2 +-
 testsuite/tests/rebindable/DoRestrictedM.hs        |   6 +-
 testsuite/tests/rebindable/RebindableFailA.hs      |  19 ++++
 testsuite/tests/rebindable/RebindableFailA.stderr  |   3 +
 testsuite/tests/rebindable/RebindableFailB.hs      |  20 ++++
 testsuite/tests/rebindable/RebindableFailB.stdout  |   1 +
 testsuite/tests/rebindable/T5908.hs                |   5 -
 testsuite/tests/rebindable/all.T                   |   6 +-
 testsuite/tests/rebindable/rebindable1.hs          |   3 +-
 testsuite/tests/rebindable/rebindable11.hs         |  15 ---
 testsuite/tests/rebindable/rebindable11.stderr     |   0
 testsuite/tests/rebindable/rebindable12.hs         |  14 ---
 testsuite/tests/rebindable/rebindable12.stderr     |   4 -
 testsuite/tests/rebindable/rebindable2.hs          |   6 +-
 .../tests/rename/should_fail/rnfail040.stderr      |   2 +-
 testsuite/tests/roles/should_compile/Roles1.stderr |   2 +-
 .../tests/roles/should_compile/Roles14.stderr      |   2 +-
 testsuite/tests/roles/should_compile/Roles2.stderr |   2 +-
 testsuite/tests/roles/should_compile/Roles3.stderr |   2 +-
 testsuite/tests/roles/should_compile/Roles4.stderr |   2 +-
 testsuite/tests/roles/should_compile/T8958.stderr  |   2 +-
 testsuite/tests/safeHaskell/check/Check01.stderr   |   2 +-
 testsuite/tests/safeHaskell/check/Check06.stderr   |   2 +-
 testsuite/tests/safeHaskell/check/Check08.stderr   |   2 +-
 testsuite/tests/safeHaskell/check/Check09.stderr   |   4 +-
 .../tests/safeHaskell/check/pkg01/ImpSafe01.stderr |   2 +-
 .../tests/safeHaskell/check/pkg01/ImpSafe04.stderr |   2 +-
 .../tests/safeHaskell/flags/SafeFlags17.stderr     |   2 +-
 testsuite/tests/simplCore/prog002/Simpl009Help.hs  |   3 -
 testsuite/tests/simplCore/should_compile/T8331.hs  |   2 +
 testsuite/tests/th/T15321.stderr                   |   4 +-
 .../tests/typecheck/should_compile/T12763.stderr   |   2 +-
 .../tests/typecheck/should_compile/T15645.stderr   |   4 -
 testsuite/tests/typecheck/should_compile/T4524.hs  |   2 +
 testsuite/tests/typecheck/should_compile/T4969.hs  |   1 -
 .../tests/typecheck/should_compile/Tc239_Help.hs   |   1 -
 .../abstract_refinement_hole_fits.stderr           |   8 --
 .../should_compile/constraint_hole_fits.stderr     |   2 -
 .../should_compile/refinement_hole_fits.stderr     |  10 --
 .../subsumption_sort_hole_fits.stderr              |  12 +--
 .../tests/typecheck/should_compile/tc231.stderr    |   2 +-
 .../should_compile/valid_hole_fits.stderr          |   4 +-
 .../should_fail/TcStaticPointersFail02.stderr      |   4 +-
 .../tests/typecheck/should_fail/tcfail182.stderr   |   2 +-
 .../tests/typecheck/should_run/T1735_Help/State.hs |   4 +-
 testsuite/tests/warnings/should_compile/T11128.hs  |  50 ----------
 .../tests/warnings/should_compile/T11128.stderr    |  20 ----
 testsuite/tests/warnings/should_compile/T11128b.hs |  64 ------------
 .../tests/warnings/should_compile/T11128b.stderr   |  10 --
 testsuite/tests/warnings/should_compile/all.T      |   2 -
 testsuite/tests/wcompat-warnings/Template.hs       |   7 +-
 .../wcompat-warnings/WCompatWarningsOn.stderr      |  29 +-----
 153 files changed, 230 insertions(+), 802 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ab51bee40c82cd552bcf13e24b67d43f3b8d25f3


More information about the ghc-commits mailing list