Merge pull request #3985 from retronym/merge/2.11.x-to-2.12.x-20140915

Merge 2.11.x to 2.12.x

9 files changed, 121 insertions, 23 deletions

diff --git a/test/files/jvm/varargs/VaClass.scala b/test/files/jvm/varargs/VaClass.scala
index e94e8a625a..d83e63ace1 100644
--- a/test/files/jvm/varargs/VaClass.scala
+++ b/test/files/jvm/varargs/VaClass.scala
@@ -9,5 +9,7 @@ class VaClass {
   @varargs def vs(a: Int, b: String*) = println(a + b.length)
   @varargs def vi(a: Int, b: Int*) = println(a + b.sum)
   @varargs def vt[T](a: Int, b: T*) = println(a + b.length)
-  @varargs def vt1[T](a: Int, b: T*): T = b.head
+
+  // TODO remove type bound after fixing SI-8786, see also https://github.com/scala/scala/pull/3961
+  @varargs def vt1[T <: String](a: Int, b: T*): T = b.head
 }
diff --git a/test/files/neg/compile-time-only-a.check b/test/files/neg/compile-time-only-a.check
index 9bc96f6b9b..b1ed1d24c2 100644
--- a/test/files/neg/compile-time-only-a.check
+++ b/test/files/neg/compile-time-only-a.check
@@ -4,9 +4,6 @@ compile-time-only-a.scala:10: error: C3
 compile-time-only-a.scala:12: error: C4
 @compileTimeOnly("C4") case class C4(x: Int)
                                   ^
-compile-time-only-a.scala:17: error: C5
-  implicit class C5(val x: Int) {
-                 ^
 compile-time-only-a.scala:32: error: C1
   new C1()
       ^
@@ -76,4 +73,4 @@ compile-time-only-a.scala:75: error: placebo
 compile-time-only-a.scala:75: error: placebo
   @placebo def x = (2: @placebo)
                         ^
-26 errors found
+25 errors found
diff --git a/test/files/neg/warn-unused-privates.check b/test/files/neg/warn-unused-privates.check
index d012869c93..4876ed8fc2 100644
--- a/test/files/neg/warn-unused-privates.check
+++ b/test/files/neg/warn-unused-privates.check
@@ -10,57 +10,60 @@ warn-unused-privates.scala:6: warning: private val in class Bippy is never used
 warn-unused-privates.scala:13: warning: private val in object Bippy is never used
   private val HEY_INSTANCE: Int = 1000    // warn
               ^
-warn-unused-privates.scala:35: warning: private val in class Boppy is never used
+warn-unused-privates.scala:14: warning: private val in object Bippy is never used
+  private lazy val BOOL: Boolean = true   // warn
+                   ^
+warn-unused-privates.scala:36: warning: private val in class Boppy is never used
   private val hummer = "def" // warn
               ^
-warn-unused-privates.scala:42: warning: private var in trait Accessors is never used
+warn-unused-privates.scala:43: warning: private var in trait Accessors is never used
   private var v1: Int = 0 // warn
               ^
-warn-unused-privates.scala:42: warning: private setter in trait Accessors is never used
+warn-unused-privates.scala:43: warning: private setter in trait Accessors is never used
   private var v1: Int = 0 // warn
               ^
-warn-unused-privates.scala:43: warning: private setter in trait Accessors is never used
+warn-unused-privates.scala:44: warning: private setter in trait Accessors is never used
   private var v2: Int = 0 // warn, never set
               ^
-warn-unused-privates.scala:44: warning: private var in trait Accessors is never used
+warn-unused-privates.scala:45: warning: private var in trait Accessors is never used
   private var v3: Int = 0 // warn, never got
               ^
-warn-unused-privates.scala:56: warning: private default argument in trait DefaultArgs is never used
+warn-unused-privates.scala:57: warning: private default argument in trait DefaultArgs is never used
   private def bippy(x1: Int, x2: Int = 10, x3: Int = 15): Int = x1 + x2 + x3
                              ^
-warn-unused-privates.scala:56: warning: private default argument in trait DefaultArgs is never used
+warn-unused-privates.scala:57: warning: private default argument in trait DefaultArgs is never used
   private def bippy(x1: Int, x2: Int = 10, x3: Int = 15): Int = x1 + x2 + x3
                                            ^
-warn-unused-privates.scala:67: warning: local var in method f0 is never used
+warn-unused-privates.scala:68: warning: local var in method f0 is never used
     var x = 1 // warn
         ^
-warn-unused-privates.scala:74: warning: local val in method f1 is never used
+warn-unused-privates.scala:75: warning: local val in method f1 is never used
     val b = new Outer // warn
         ^
-warn-unused-privates.scala:84: warning: private object in object Types is never used
+warn-unused-privates.scala:85: warning: private object in object Types is never used
   private object Dongo { def f = this } // warn
                  ^
-warn-unused-privates.scala:94: warning: local object in method l1 is never used
+warn-unused-privates.scala:95: warning: local object in method l1 is never used
     object HiObject { def f = this } // warn
            ^
-warn-unused-privates.scala:78: warning: local var x in method f2 is never set - it could be a val
+warn-unused-privates.scala:79: warning: local var x in method f2 is never set - it could be a val
     var x = 100 // warn about it being a var
         ^
-warn-unused-privates.scala:85: warning: private class Bar1 in object Types is never used
+warn-unused-privates.scala:86: warning: private class Bar1 in object Types is never used
   private class Bar1 // warn
                 ^
-warn-unused-privates.scala:87: warning: private type Alias1 in object Types is never used
+warn-unused-privates.scala:88: warning: private type Alias1 in object Types is never used
   private type Alias1 = String // warn
                ^
-warn-unused-privates.scala:95: warning: local class Hi is never used
+warn-unused-privates.scala:96: warning: local class Hi is never used
     class Hi { // warn
           ^
-warn-unused-privates.scala:99: warning: local class DingDongDoobie is never used
+warn-unused-privates.scala:100: warning: local class DingDongDoobie is never used
     class DingDongDoobie // warn
           ^
-warn-unused-privates.scala:102: warning: local type OtherThing is never used
+warn-unused-privates.scala:103: warning: local type OtherThing is never used
     type OtherThing = String // warn
          ^
 error: No warnings can be incurred under -Xfatal-warnings.
-21 warnings found
+22 warnings found
 one error found
diff --git a/test/files/neg/warn-unused-privates.scala b/test/files/neg/warn-unused-privates.scala
index cb6e946a34..2faa07e759 100644
--- a/test/files/neg/warn-unused-privates.scala
+++ b/test/files/neg/warn-unused-privates.scala
@@ -11,6 +11,7 @@ object Bippy {
   def hi(x: Bippy) = x.HI_COMPANION
   private val HI_INSTANCE: Int = 500      // no warn, accessed from instance
   private val HEY_INSTANCE: Int = 1000    // warn
+  private lazy val BOOL: Boolean = true   // warn
 }
 
 class A(val msg: String)
diff --git a/test/files/pos/t8410.flags b/test/files/pos/t8410.flags
new file mode 100644
index 0000000000..dcd5943c2f
--- /dev/null
+++ b/test/files/pos/t8410.flags
@@ -0,0 +1 @@
+-optimise -Xfatal-warnings -deprecation:false -Yinline-warnings:false
diff --git a/test/files/pos/t8410.scala b/test/files/pos/t8410.scala
new file mode 100644
index 0000000000..4d862311fa
--- /dev/null
+++ b/test/files/pos/t8410.scala
@@ -0,0 +1,15 @@
+
+object Test extends App {
+  @deprecated("","") def f = 42
+  @deprecated("","") def z = f
+  def g = { @deprecated("","") def _f = f ; _f }                   // warns in 2.11.0-M8
+  def x = { @deprecated("","") class X { def x = f } ; new X().x } // warns in 2.11.0-M8
+  Console println g
+  Console println f  // warns
+
+  @deprecated("","") trait T
+  object T extends T { def t = f }
+  Console println T.t
+
+  def k = List(0).dropWhile(_ < 1)   // inlining warns doubly
+}
diff --git a/test/files/pos/t8498.scala b/test/files/pos/t8498.scala
new file mode 100644
index 0000000000..6808c89051
--- /dev/null
+++ b/test/files/pos/t8498.scala
@@ -0,0 +1,6 @@
+import scala.annotation.compileTimeOnly
+
+class C(val s: String) extends AnyVal {
+  @compileTimeOnly("error")
+  def error = ???
+}
diff --git a/test/files/run/t8803.check b/test/files/run/t8803.check
new file mode 100644
index 0000000000..bd26a0fb14
--- /dev/null
+++ b/test/files/run/t8803.check
@@ -0,0 +1,16 @@
+a
+b
+b
+c
+a
+b
+b
+c
+a
+b
+b
+c
+a
+b
+b
+c
diff --git a/test/files/run/t8803.scala b/test/files/run/t8803.scala
new file mode 100644
index 0000000000..2e56180502
--- /dev/null
+++ b/test/files/run/t8803.scala
@@ -0,0 +1,57 @@
+class A {
+  def m = "a"
+  protected def n = "a"
+}
+
+trait B {
+  def m = "b"
+  protected def n = "b"
+}
+
+class C extends A with B {
+  override def m = "c"
+  override protected def n = "c"
+
+  val f1 = () => super[A].m
+  val f2 = () => super[B].m
+  val f3 = () => super.m
+  val f4 = () => this.m
+
+  val g1 = new runtime.AbstractFunction0[String] { def apply() = C.super[A].m }
+  val g2 = new runtime.AbstractFunction0[String] { def apply() = C.super[B].m }
+  val g3 = new runtime.AbstractFunction0[String] { def apply() = C.super.m }
+  val g4 = new runtime.AbstractFunction0[String] { def apply() = C.this.m }
+
+  val h1 = () => super[A].n
+  val h2 = () => super[B].n
+  val h3 = () => super.n
+  val h4 = () => this.n
+
+  val i1 = new runtime.AbstractFunction0[String] { def apply() = C.super[A].n }
+  val i2 = new runtime.AbstractFunction0[String] { def apply() = C.super[B].n }
+  val i3 = new runtime.AbstractFunction0[String] { def apply() = C.super.n }
+  val i4 = new runtime.AbstractFunction0[String] { def apply() = C.this.n }
+}
+
+object Test extends App {
+  val c = new C
+  println(c.f1())
+  println(c.f2())
+  println(c.f3())
+  println(c.f4())
+
+  println(c.g1())
+  println(c.g2())
+  println(c.g3())
+  println(c.g4())
+
+  println(c.h1())
+  println(c.h2())
+  println(c.h3())
+  println(c.h4())
+
+  println(c.i1())
+  println(c.i2())
+  println(c.i3())
+  println(c.i4())
+}