Merge remote-tracking branch 'origin/2.10.2' into merge/2.10.2-to-2.10.x

Better late than never.

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala

1 files changed, 0 insertions, 20 deletions

diff --git a/test/files/pos/t7234b.scala b/test/files/pos/t7234b.scala
deleted file mode 100644
index fee98e87a8..0000000000
--- a/test/files/pos/t7234b.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-trait Main {
-  trait A {
-    type B
-    def b: B
-  }
-  trait C {
-    def c(a: A, x: Int = 0)(b: => a.B, bs: a.B*)
-    def d(a: A = null, x: Int = 0)(b1: => a.B = a.b, b2: a.B = a.b)
-  }
-  def c: C
-  def ok(a: A)(b: a.B) = c.c(a, 42)(b)
-  def fail(a: A)(b: a.B) = c.c(a)(b)
-  def fail2(a: A)(b: a.B) = c.c(a)(b, b)
-  def fail3(a: A)(b: a.B) = c.c(a)(b, Seq[a.B](b): _*)
-
-  def fail4(a: A)(b: a.B) = c.d(a)()
-  def fail5(a: A)(b: a.B) = c.d(a)(b1 = a.b)
-  def fail6(a: A)(b: a.B) = c.d(a)(b2 = a.b)
-  def fail7(a: A)(b: a.B) = c.d()()
-}