diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2021-02-07 21:52:49 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-02-13 21:31:59 -0500 |
| commit | dcc4b2de37f73a05a106b78bae0b99eb9715cf01 (patch) | |
| tree | 8a5c8de59fd486213f326892e31e788f87f067b1 /compiler/GHC | |
| parent | 18e5338671518d060006010ebb796df265cb52e3 (diff) | |
| download | haskell-dcc4b2de37f73a05a106b78bae0b99eb9715cf01.tar.gz | |
Remove deprecated -XGenerics and -XMonoPatBinds
They have no effect since 2011 (GHC 7.2/7.4),
commits cb698570b2b and 49dbe60558.
Diffstat (limited to 'compiler/GHC')
| -rw-r--r-- | compiler/GHC/Core/TyCon.hs | 5 | ||||
| -rw-r--r-- | compiler/GHC/Driver/Session.hs | 15 |
2 files changed, 1 insertions, 19 deletions
diff --git a/compiler/GHC/Core/TyCon.hs b/compiler/GHC/Core/TyCon.hs index efa6cfbcf7..2684a4d6d4 100644 --- a/compiler/GHC/Core/TyCon.hs +++ b/compiler/GHC/Core/TyCon.hs @@ -1612,10 +1612,7 @@ mkFunTyCon name binders rep_nm tcRepName = rep_nm } --- | This is the making of an algebraic 'TyCon'. Notably, you have to --- pass in the generic (in the -XGenerics sense) information about the --- type constructor - you can get hold of it easily (see Generics --- module) +-- | This is the making of an algebraic 'TyCon'. mkAlgTyCon :: Name -> [TyConBinder] -- ^ Binders of the 'TyCon' -> Kind -- ^ Result kind diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs index 479223af9c..400eb31faa 100644 --- a/compiler/GHC/Driver/Session.hs +++ b/compiler/GHC/Driver/Session.hs @@ -1342,8 +1342,6 @@ languageExtensions Nothing -- http://www.haskell.org/pipermail/haskell-prime/2011-January/003335.html (languageExtensions (Just Haskell2010)) - -- NB: MonoPatBinds is no longer the default - languageExtensions (Just Haskell98) = [LangExt.ImplicitPrelude, -- See Note [When is StarIsType enabled] @@ -2843,14 +2841,6 @@ dynamic_flags_deps = [ ++ map (mkFlag turnOff "XNo" unSetExtensionFlag) xFlagsDeps ++ map (mkFlag turnOn "X" setLanguage ) languageFlagsDeps ++ map (mkFlag turnOn "X" setSafeHaskell ) safeHaskellFlagsDeps - ++ [ make_dep_flag defFlag "XGenerics" - (NoArg $ return ()) - ("it does nothing; look into -XDefaultSignatures " ++ - "and -XDeriveGeneric for generic programming support.") - , make_dep_flag defFlag "XNoGenerics" - (NoArg $ return ()) - ("it does nothing; look into -XDefaultSignatures and " ++ - "-XDeriveGeneric for generic programming support.") ] -- | This is where we handle unrecognised warning flags. We only issue a warning -- if -Wunrecognised-warning-flags is set. See #11429 for context. @@ -3371,8 +3361,6 @@ fLangFlagsDeps = [ (deprecatedForExtension "BangPatterns"), depFlagSpec' "monomorphism-restriction" LangExt.MonomorphismRestriction (deprecatedForExtension "MonomorphismRestriction"), - depFlagSpec' "mono-pat-binds" LangExt.MonoPatBinds - (deprecatedForExtension "MonoPatBinds"), depFlagSpec' "extended-default-rules" LangExt.ExtendedDefaultRules (deprecatedForExtension "ExtendedDefaultRules"), depFlagSpec' "implicit-params" LangExt.ImplicitParams @@ -3511,9 +3499,6 @@ xFlagsDeps = [ flagSpec "MagicHash" LangExt.MagicHash, flagSpec "MonadComprehensions" LangExt.MonadComprehensions, flagSpec "MonoLocalBinds" LangExt.MonoLocalBinds, - depFlagSpecCond "MonoPatBinds" LangExt.MonoPatBinds - id - "Experimental feature now removed; has no effect", flagSpec "MonomorphismRestriction" LangExt.MonomorphismRestriction, flagSpec "MultiParamTypeClasses" LangExt.MultiParamTypeClasses, flagSpec "MultiWayIf" LangExt.MultiWayIf, |