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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/ast/Trees.scala b/src/compiler/scala/tools/nsc/ast/Trees.scala
index acf0a8ee6f..3ccc595fb2 100644
--- a/src/compiler/scala/tools/nsc/ast/Trees.scala
+++ b/src/compiler/scala/tools/nsc/ast/Trees.scala
@@ -178,7 +178,7 @@ trait Trees extends scala.reflect.internal.Trees { self: Global =>
     case _ => super.xtraverse(traverser, tree)
   }
 
-  trait TreeCopier extends super.TreeCopierOps {
+  trait TreeCopier extends super.InternalTreeCopierOps {
     def DocDef(tree: Tree, comment: DocComment, definition: Tree): DocDef
     def SelectFromArray(tree: Tree, qualifier: Tree, selector: Name, erasure: Type): SelectFromArray
     def InjectDerivedValue(tree: Tree, arg: Tree): InjectDerivedValue
@@ -281,7 +281,7 @@ trait Trees extends scala.reflect.internal.Trees { self: Global =>
     val trace = scala.tools.nsc.util.trace when debug
 
     val locals = util.HashSet[Symbol](8)
-    val orderedLocals = collection.mutable.ListBuffer[Symbol]()
+    val orderedLocals = scala.collection.mutable.ListBuffer[Symbol]()
     def registerLocal(sym: Symbol) {
       if (sym != null && sym != NoSymbol) {
         if (debug && !(locals contains sym)) orderedLocals append sym