diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-08-31 16:05:26 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-08-31 16:09:25 +0200 |
| commit | 737f36823d03a6c9d92f56e3e2433a3961780e13 (patch) | |
| tree | 251c4655db37e898ac10a31ac37735e0cb1bcd9a /compiler/main | |
| parent | a8a969ae7a05e408b29961d0a2ea621a16d73d3e (diff) | |
| download | haskell-737f36823d03a6c9d92f56e3e2433a3961780e13.tar.gz | |
`M-x delete-trailing-whitespace` & `M-x untabify`...
...some files more or less recently touched by me
[ci skip]
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 0d4347df4e..5d0e2a2b94 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -2905,7 +2905,7 @@ xFlags = [ deprecatedForExtension "MultiParamTypeClasses" ), ( "FunctionalDependencies", Opt_FunctionalDependencies, nop ), ( "GeneralizedNewtypeDeriving", Opt_GeneralizedNewtypeDeriving, setGenDeriving ), - ( "OverlappingInstances", Opt_OverlappingInstances, + ( "OverlappingInstances", Opt_OverlappingInstances, \ turn_on -> when turn_on $ deprecate "instead use per-instance pragmas OVERLAPPING/OVERLAPPABLE/OVERLAPS" ), ( "UndecidableInstances", Opt_UndecidableInstances, nop ), @@ -2996,7 +2996,7 @@ impliedFlags , (Opt_ImplicitParams, turnOn, Opt_FlexibleInstances) , (Opt_JavaScriptFFI, turnOn, Opt_InterruptibleFFI) - + , (Opt_DeriveTraversable, turnOn, Opt_DeriveFunctor) , (Opt_DeriveTraversable, turnOn, Opt_DeriveFoldable) ] |