diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-03-31 21:20:15 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-03-31 21:20:15 +0200 |
| commit | a25b3f70eb6ebe2fac867a5b85cfe5b9883814cc (patch) | |
| tree | 096e8468bcb4f69dfb91eb5bcc5307ac2dc26966 /src | |
| parent | c8757cd13618b6dfb8c9c157c87989fb973c548f (diff) | |
| parent | d04cd7b39107fb7cb817a08265724c00043b1396 (diff) | |
| download | scala-a25b3f70eb6ebe2fac867a5b85cfe5b9883814cc.tar.gz scala-a25b3f70eb6ebe2fac867a5b85cfe5b9883814cc.tar.bz2 scala-a25b3f70eb6ebe2fac867a5b85cfe5b9883814cc.zip | |
Merge pull request #4375 from som-snytt/issue/8861
SI-8861 Handle alias when probing for Any
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Infer.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala index cf97474d9a..27e17fc65f 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Infer.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala @@ -553,9 +553,8 @@ trait Infer extends Checkable { // ...or lower bound of a type param, since they're asking for it. def canWarnAboutAny = { val loBounds = tparams map (_.info.bounds.lo) - val hasAny = pt :: restpe :: formals ::: argtpes ::: loBounds exists (t => - (t contains AnyClass) || (t contains AnyValClass) - ) + def containsAny(t: Type) = (t contains AnyClass) || (t contains AnyValClass) + val hasAny = pt :: restpe :: formals ::: argtpes ::: loBounds exists (_.dealiasWidenChain exists containsAny) !hasAny } def argumentPosition(idx: Int): Position = context.tree match { |