Another warning for -Xstrict-warnings.

beloved try/catch blocks which swallow all comers. Realized that two
warnings are already one too many to combine under a single option, and
broke them out into individual options.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index b81c087901..269e9ca938 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1651,7 +1651,7 @@ trait Typers { self: Analyzer =>
       // catches method parameters shadowing identifiers declared in the same file, so more
       // work is needed.  Most of the code here is to filter out false positives.
       def isAuxConstructor(sym: Symbol) = sym.isConstructor && !sym.isPrimaryConstructor
-      if (settings.Xwarnings.value && !isAuxConstructor(ddef.symbol)) {
+      if (settings.YwarnShadow.value && !isAuxConstructor(ddef.symbol)) {
         for (v <- ddef.vparamss.flatten ; if v.symbol != null && !(v.symbol hasFlag SYNTHETIC))
           checkShadowings(v, (sym => !sym.isDeferred && !sym.isMethod))
       }
@@ -1752,7 +1752,7 @@ trait Typers { self: Analyzer =>
           while ((e ne null) && (e.sym ne stat.symbol)) e = e.tail
           if (e eq null) context.scope.enter(stat.symbol)
         }
-        if (settings.Xwarnings.value) checkShadowings(stat)
+        if (settings.YwarnShadow.value) checkShadowings(stat)
         enterLabelDef(stat)
       }
       val stats1 = typedStats(block.stats, context.owner)