diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-03-24 15:55:31 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-03-24 15:55:31 +1000 |
| commit | 2dc40cc7d7d956a510a9278ab236014f3fb564bc (patch) | |
| tree | 26849309912c536f39cc538e21e4093b4ea0004d /src | |
| parent | 4f05b1938c6343ea3f36dceada9f26a0b2b69a45 (diff) | |
| parent | bf01acd6143552be8a173472a839dfcdee27697c (diff) | |
| download | scala-2dc40cc7d7d956a510a9278ab236014f3fb564bc.tar.gz scala-2dc40cc7d7d956a510a9278ab236014f3fb564bc.tar.bz2 scala-2dc40cc7d7d956a510a9278ab236014f3fb564bc.zip | |
Merge pull request #4380 from retronym/ticket/9020
SI-9020 Avoid spurious value discarding warning post-typer
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 4 |
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 c8970727d4..d01e4f84ba 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1039,11 +1039,11 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper // to non-continuation types. if (tree.tpe <:< AnyTpe) pt.dealias match { case TypeRef(_, UnitClass, _) => // (12) - if (settings.warnValueDiscard) + if (!isPastTyper && settings.warnValueDiscard) context.warning(tree.pos, "discarded non-Unit value") return typedPos(tree.pos, mode, pt)(Block(List(tree), Literal(Constant(())))) case TypeRef(_, sym, _) if isNumericValueClass(sym) && isNumericSubType(tree.tpe, pt) => - if (settings.warnNumericWiden) + if (!isPastTyper && settings.warnNumericWiden) context.warning(tree.pos, "implicit numeric widening") return typedPos(tree.pos, mode, pt)(Select(tree, "to" + sym.name)) case _ => |