diff options
| author | Sjoerd Visscher <sjoerd@w3future.com> | 2014-06-06 14:31:51 +0200 |
|---|---|---|
| committer | Sjoerd Visscher <sjoerd@w3future.com> | 2014-06-06 14:31:51 +0200 |
| commit | 5c89f8802e8e1e1398705fcaf22f1af3ad24304a (patch) | |
| tree | b3344169277b7c77bd5c6020c7cb5f8ac6867bbb /compiler/main/DynFlags.hs | |
| parent | 63e1f0960c458787eabf8a54b3807021efe48640 (diff) | |
| parent | 7ac600d5fcd74db1f991555de6e415030970d5f3 (diff) | |
| download | haskell-5c89f8802e8e1e1398705fcaf22f1af3ad24304a.tar.gz | |
Merge branch 'master' of git://git.haskell.org/ghc
Conflicts:
docs/users_guide/flags.xml
Diffstat (limited to 'compiler/main/DynFlags.hs')
| -rw-r--r-- | compiler/main/DynFlags.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 8aa4375968..4db1d2cbfb 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -2865,7 +2865,8 @@ xFlags = [ ( "FlexibleInstances", Opt_FlexibleInstances, nop ), ( "ConstrainedClassMethods", Opt_ConstrainedClassMethods, nop ), ( "MultiParamTypeClasses", Opt_MultiParamTypeClasses, nop ), - ( "NullaryTypeClasses", Opt_NullaryTypeClasses, nop ), + ( "NullaryTypeClasses", Opt_NullaryTypeClasses, + deprecatedForExtension "MultiParamTypeClasses" ), ( "FunctionalDependencies", Opt_FunctionalDependencies, nop ), ( "GeneralizedNewtypeDeriving", Opt_GeneralizedNewtypeDeriving, setGenDeriving ), ( "OverlappingInstances", Opt_OverlappingInstances, nop ), |