Merge branch 'merge-2.10.0-wip' into merge-2.10.x

* merge-2.10.0-wip:
  Use Typed rather than .setType
  Wider use and a new variant of typedPos.
  SI-6575 Plug inference leak of AbstractPartialFun
  Remove compiler phases that don't influence scaladoc generation.
  Disabled generation of _1, _2, etc. methods.
  SI-6526 Additional test case.
  Fix SI-6552, regression with self types.
  avoid single-art assert where harmful in duration-tck
  Fix for SI-6537, inaccurate unchecked warning.
  Crash on missing accessor (internal bug in the lazy vals implementation) instead of trying to recover from the bug
  Incorporated changes suggested in code review
  Added one more test for SI-6358
  Closes SI-6358. Move accessor generation for lazy vals to typers.
  SI-6526 Tail call elimination should descend deeper.
  Remove unneeded calls to substring()
  Changes Tree and Type members from vals to defs.
  Scaladoc knows the package structure of the libraries, so don't include them in external documentation setting.
  Fixes SI-6170: issue with dragging scaladoc splitter over central iframe
  Added a Swing ColorChooser wrapper
  Added a Swing PopupMenu wrapper

Conflicts:
	src/compiler/scala/reflect/reify/phases/Reshape.scala
	src/compiler/scala/tools/nsc/typechecker/Duplicators.scala
	src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala
	src/reflect/scala/reflect/internal/Types.scala
	test/files/neg/unchecked-knowable.check

5 files changed, 57 insertions, 0 deletions

diff --git a/test/files/pos/t6537.flags b/test/files/pos/t6537.flags
new file mode 100644
index 0000000000..85d8eb2ba2
--- /dev/null
+++ b/test/files/pos/t6537.flags
@@ -0,0 +1 @@
+-Xfatal-warnings
diff --git a/test/files/pos/t6537.scala b/test/files/pos/t6537.scala
new file mode 100644
index 0000000000..d0ca3ba435
--- /dev/null
+++ b/test/files/pos/t6537.scala
@@ -0,0 +1,16 @@
+package tester
+
+object PatMatWarning {
+
+  sealed trait X
+  sealed trait Y
+
+  def f(x: X) = x match {
+    case _: Y => false
+    case _    => true
+  }
+
+  class X1 extends X
+  class Y1 extends Y
+  class Z1 extends X with Y
+}
diff --git a/test/files/pos/t6552.scala b/test/files/pos/t6552.scala
new file mode 100644
index 0000000000..98e686a1ae
--- /dev/null
+++ b/test/files/pos/t6552.scala
@@ -0,0 +1,8 @@
+object Repros {
+  class Bar {}
+  class Baz(val myFoo: Foo) { }
+  trait Foo {
+    this: Bar =>
+    val thing = new Baz(this)
+  }
+}
diff --git a/test/files/pos/t6575a.scala b/test/files/pos/t6575a.scala
new file mode 100644
index 0000000000..f128714dab
--- /dev/null
+++ b/test/files/pos/t6575a.scala
@@ -0,0 +1,15 @@
+trait X { def foo: PartialFunction[Int, Int] }
+
+trait Y extends X {
+  // Inferred type was AbstractPartialFunction[Int, Int] with Serializable
+  abstract override def foo = { case i => super.foo(i) * 2 }
+}
+trait Z extends X {
+  // ditto
+  abstract override def foo = { case i => super.foo(i) + 3 }
+}
+
+trait Comb extends Y with Z {
+  // ... which led to a type error here.
+  abstract override def foo: PartialFunction[Int, Int] = { case i => super.foo(i) - 2 }
+}
diff --git a/test/files/pos/t6575b.scala b/test/files/pos/t6575b.scala
new file mode 100644
index 0000000000..d3e58b2a16
--- /dev/null
+++ b/test/files/pos/t6575b.scala
@@ -0,0 +1,17 @@
+// inferred types were okay here as Function nodes aren't
+// translated into anoymous subclasses of AbstractFunctionN
+// until after the typer.
+//
+// So this test is just confirmation.
+trait X { def foo: Function1[Int, Int] }
+
+trait Y extends X {
+  abstract override def foo = { case i => super.foo(i) * 2 }
+}
+trait Z extends X {
+  abstract override def foo = { case i => super.foo(i) + 3 }
+}
+
+trait Comb extends Y with Z {
+  abstract override def foo: Function1[Int, Int] = { case i => super.foo(i) - 2 }
+}