diff options
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 27 | ||||
| -rw-r--r-- | compiler/main/InteractiveEval.hs | 4 |
2 files changed, 26 insertions, 5 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index de768c0315..6d6670cb32 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -488,7 +488,9 @@ data WarningFlag = | Opt_WarnOverlappingPatterns | Opt_WarnTypeDefaults | Opt_WarnMonomorphism - | Opt_WarnUnusedBinds + | Opt_WarnUnusedTopBinds + | Opt_WarnUnusedLocalBinds + | Opt_WarnUnusedPatternBinds | Opt_WarnUnusedImports | Opt_WarnUnusedMatches | Opt_WarnContextQuantification @@ -2676,6 +2678,8 @@ dynamic_flags = [ , defFlag "fno-glasgow-exts" (NoArg (do disableGlasgowExts deprecate "Use individual extensions instead")) + , defFlag "fwarn-unused-binds" (NoArg enableUnusedBinds) + , defFlag "fno-warn-unused-binds" (NoArg disableUnusedBinds) ------ Safe Haskell flags ------------------------------------------- , defFlag "fpackage-trust" (NoArg setPackageTrust) @@ -2883,10 +2887,12 @@ fWarningFlags = [ flagSpec "warn-unsupported-llvm-version" Opt_WarnUnsupportedLlvmVersion, flagSpec "warn-unticked-promoted-constructors" Opt_WarnUntickedPromotedConstructors, - flagSpec "warn-unused-binds" Opt_WarnUnusedBinds, flagSpec "warn-unused-do-bind" Opt_WarnUnusedDoBind, flagSpec "warn-unused-imports" Opt_WarnUnusedImports, + flagSpec "warn-unused-local-binds" Opt_WarnUnusedLocalBinds, flagSpec "warn-unused-matches" Opt_WarnUnusedMatches, + flagSpec "warn-unused-pattern-binds" Opt_WarnUnusedPatternBinds, + flagSpec "warn-unused-top-binds" Opt_WarnUnusedTopBinds, flagSpec "warn-warnings-deprecations" Opt_WarnWarningsDeprecations, flagSpec "warn-wrong-do-bind" Opt_WarnWrongDoBind] @@ -3359,7 +3365,9 @@ minusWOpts :: [WarningFlag] -- Things you get with -W minusWOpts = standardWarnings ++ - [ Opt_WarnUnusedBinds, + [ Opt_WarnUnusedTopBinds, + Opt_WarnUnusedLocalBinds, + Opt_WarnUnusedPatternBinds, Opt_WarnUnusedMatches, Opt_WarnUnusedImports, Opt_WarnIncompletePatterns, @@ -3381,6 +3389,19 @@ minusWallOpts Opt_WarnUntickedPromotedConstructors ] +enableUnusedBinds :: DynP () +enableUnusedBinds = mapM_ setWarningFlag unusedBindsFlags + +disableUnusedBinds :: DynP () +disableUnusedBinds = mapM_ unSetWarningFlag unusedBindsFlags + +-- Things you get with -fwarn-unused-binds +unusedBindsFlags :: [WarningFlag] +unusedBindsFlags = [ Opt_WarnUnusedTopBinds + , Opt_WarnUnusedLocalBinds + , Opt_WarnUnusedPatternBinds + ] + enableGlasgowExts :: DynP () enableGlasgowExts = do setGeneralFlag Opt_PrintExplicitForalls mapM_ setExtensionFlag glasgowExtsFlags diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs index 70c61f2215..ff588e1276 100644 --- a/compiler/main/InteractiveEval.hs +++ b/compiler/main/InteractiveEval.hs @@ -168,10 +168,10 @@ runStmtWithLocation source linenumber expr step = breakMVar <- liftIO $ newEmptyMVar -- wait on this when we hit a breakpoint statusMVar <- liftIO $ newEmptyMVar -- wait on this when a computation is running - -- Turn off -fwarn-unused-bindings when running a statement, to hide + -- Turn off -fwarn-unused-local-binds when running a statement, to hide -- warnings about the implicit bindings we introduce. let ic = hsc_IC hsc_env -- use the interactive dflags - idflags' = ic_dflags ic `wopt_unset` Opt_WarnUnusedBinds + idflags' = ic_dflags ic `wopt_unset` Opt_WarnUnusedLocalBinds hsc_env' = hsc_env{ hsc_IC = ic{ ic_dflags = idflags' } } -- compile to value (IO [HValue]), don't run |