Merge branch '2.10.x' into master

* 2.10.x: (51 commits)
  improved/fixed reflection docs based on comments
  Fixes SI-6354: improved error messages for Dynamic signature mismatches.
  Add RedBlackTree tests for take/drop/slice.
  Retain Ordering in drop/take/slice signatures.
  test case closes SI-5770
  clarify caveats of App trait
  Remove `@static` annotation from the library.
  New starr that does not depend on `@static`.
  improved reflection documentation
  pull request feedback
  SI-5692 better error message
  SI-5942 toolboxes now reset front ends
  SI-6287 fixes synthetic symbol clashes in toolbox
  Revert "Implement @static annotation on singleton object fields."
  Revert "WIP add private/lazy checks and a few tests."
  Revert "Fixes SI-6189."
  Revert "Fixes SI-6236."
  Revert "Fix SI-4581."
  Revert "Fix SI-6294."
  refactors java reflection tests
  ...

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/partest/scala/tools/partest/package.scala
	src/reflect/scala/reflect/internal/Trees.scala

3 files changed, 3 insertions, 3 deletions

diff --git a/src/library/scala/collection/generic/FilterMonadic.scala b/src/library/scala/collection/generic/FilterMonadic.scala
index d79112d616..cebb4e69d3 100755
--- a/src/library/scala/collection/generic/FilterMonadic.scala
+++ b/src/library/scala/collection/generic/FilterMonadic.scala
@@ -14,7 +14,7 @@ package scala.collection.generic
  */
 trait FilterMonadic[+A, +Repr] extends Any {
   def map[B, That](f: A => B)(implicit bf: CanBuildFrom[Repr, B, That]): That
-  def flatMap[B, That](f: A => collection.GenTraversableOnce[B])(implicit bf: CanBuildFrom[Repr, B, That]): That
+  def flatMap[B, That](f: A => scala.collection.GenTraversableOnce[B])(implicit bf: CanBuildFrom[Repr, B, That]): That
   def foreach[U](f: A => U): Unit
   def withFilter(p: A => Boolean): FilterMonadic[A, Repr]
 }
diff --git a/src/library/scala/collection/generic/ParFactory.scala b/src/library/scala/collection/generic/ParFactory.scala
index 9624aafd06..6b59b6671c 100644
--- a/src/library/scala/collection/generic/ParFactory.scala
+++ b/src/library/scala/collection/generic/ParFactory.scala
@@ -24,7 +24,7 @@ abstract class ParFactory[CC[X] <: ParIterable[X] with GenericParTemplate[X, CC]
 extends GenTraversableFactory[CC]
    with GenericParCompanion[CC] {
 
-  //type EPC[T, C] = collection.parallel.EnvironmentPassingCombiner[T, C]
+  //type EPC[T, C] = scala.collection.parallel.EnvironmentPassingCombiner[T, C]
 
   /** A generic implementation of the `CanCombineFrom` trait, which forwards
    *  all calls to `apply(from)` to the `genericParBuilder` method of the $coll
diff --git a/src/library/scala/collection/generic/SliceInterval.scala b/src/library/scala/collection/generic/SliceInterval.scala
index 56033ca8d8..af56d06d60 100644
--- a/src/library/scala/collection/generic/SliceInterval.scala
+++ b/src/library/scala/collection/generic/SliceInterval.scala
@@ -32,7 +32,7 @@ private[collection] class SliceInterval private (val from: Int, val until: Int)
    */
   def recalculate(_from: Int, _until: Int): SliceInterval = {
     val lo    = _from max 0
-    val elems = math.min(_until - lo, width)
+    val elems = scala.math.min(_until - lo, width)
     val start = from + lo
 
     if (elems <= 0) new SliceInterval(from, from)