diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-10-18 07:13:17 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-10-18 07:13:17 -0700 |
| commit | 5b2c4644a23ffbe1c45df40bf3511aee71eb0fe2 (patch) | |
| tree | 92c4e81c74df149818162a7d3a77101128e0560c /src | |
| parent | 2af071df1bdbb398e642e333823775c1e406c9be (diff) | |
| parent | cd0f48c9567e9e52378c9c4c9b28e892bb2461a9 (diff) | |
| download | scala-5b2c4644a23ffbe1c45df40bf3511aee71eb0fe2.tar.gz scala-5b2c4644a23ffbe1c45df40bf3511aee71eb0fe2.tar.bz2 scala-5b2c4644a23ffbe1c45df40bf3511aee71eb0fe2.zip | |
Merge pull request #3041 from gkossakowski/merge-2.10.x
Merge 2.10.x into master
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index a9a7f6a954..36f889f8a4 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -1414,7 +1414,11 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans private def checkTypeRef(tp: Type, tree: Tree, skipBounds: Boolean) = tp match { case TypeRef(pre, sym, args) => - checkDeprecated(sym, tree.pos) + tree match { + case tt: TypeTree if tt.original == null => // SI-7783 don't warn about inferred types + case _ => + checkDeprecated(sym, tree.pos) + } if(sym.isJavaDefined) sym.typeParams foreach (_.cookJavaRawInfo()) if (!tp.isHigherKinded && !skipBounds) |