diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-16 15:51:48 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-16 15:51:48 +0200 |
| commit | cd0f48c9567e9e52378c9c4c9b28e892bb2461a9 (patch) | |
| tree | c3cfa4b876c1ccd4a3766b3a32a2c54a727be7ab /src | |
| parent | ae47ccc35bdcfbdb965e2297b131a2416495d4e7 (diff) | |
| parent | e20f9e9f1fcf2a25603b2b75528e4d9395557411 (diff) | |
| download | scala-cd0f48c9567e9e52378c9c4c9b28e892bb2461a9.tar.gz scala-cd0f48c9567e9e52378c9c4c9b28e892bb2461a9.tar.bz2 scala-cd0f48c9567e9e52378c9c4c9b28e892bb2461a9.zip | |
Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.x
Conflicts:
build.number
test/files/neg/classmanifests_new_deprecations.check
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) |