Merge pull request scala#3041 from gkossakowski/merge-2.10.x

Merge 2.10.x into master

Author: retronym

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)

test/files/jvm/deprecation.check

@@ -1,3 +1,3 @@
-warning: there were 5 deprecation warning(s); re-run with -deprecation for details
+warning: there were 4 deprecation warning(s); re-run with -deprecation for details
 Note: deprecation/Use_2.java uses or overrides a deprecated API.
 Note: Recompile with -Xlint:deprecation for details.

test/files/neg/t7783.check

@@ -0,0 +1,18 @@
+t7783.scala:1: warning: type D in object O is deprecated:
+object O { class C; @deprecated("", "") type D = C; def foo: Seq[D] = Nil }
+                                                             ^
+t7783.scala:11: warning: type D in object O is deprecated:
+  type T = O.D
+             ^
+t7783.scala:12: warning: type D in object O is deprecated:
+  locally(null: O.D)
+                  ^
+t7783.scala:13: warning: type D in object O is deprecated:
+  val x: O.D = null
+           ^
+t7783.scala:14: warning: type D in object O is deprecated:
+  locally(null.asInstanceOf[O.D])
+                              ^
+error: No warnings can be incurred under -Xfatal-warnings.
+5 warnings found
+one error found

test/files/neg/t7783.flags

@@ -0,0 +1 @@
+-deprecation -Xfatal-warnings

test/files/neg/t7783.scala

@@ -0,0 +1,15 @@
+object O { class C; @deprecated("", "") type D = C; def foo: Seq[D] = Nil }
+
+object NoWarn {
+  O.foo                        // nowarn
+  O.foo +: Nil                 // nowarn
+  def bar(a: Any, b: Any) = () // nowarn
+  bar(b = O.foo, a = ())       // nowarn
+}
+
+object Warn {
+  type T = O.D
+  locally(null: O.D)
+  val x: O.D = null
+  locally(null.asInstanceOf[O.D])
+}

test/files/run/t4542.check

@@ -7,9 +7,6 @@ scala> @deprecated("foooo", "ReplTest version 1.0-FINAL") class Foo() {
 defined class Foo
 
 scala> val f = new Foo
-<console>:8: warning: class Foo is deprecated: foooo
-       val f = new Foo
-           ^
 <console>:8: warning: class Foo is deprecated: foooo
        val f = new Foo
                    ^