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

# By Eugene Burmako (12) and others
# Via Paul Phillips (4) and others
* origin/2.10.x:
  Fixes SI-6236.
  Fixes SI-6189.
  Hunting down eliminable :: allocations.
  Absolutize tools.nsc => scala.tools.nsc.
  more cleanup for typedMacroBody
  shaves more than 150 lines off typedMacroBody
  Optimization in SubstMap.
  removes dead code
  pull request feedback
  more macro cleanup
  further cleanup of transformTypeTagEvidenceParams
  macroImplSigs => macroImplSig
  Dominik's comments on api.Mirrors
  phaseId(currentPeriod) >= erasurePhase.id
  materializeImplicit and implicitsOfExpectedType
  cleanup of reflection- and macro-related stuff
  adds the `skipPackage` attribute to Scaladoc
  Fixes backend crash due to incorrect consumedTypes
  Fix SI-6208.  mutable.Queue now returns mutable.Queue for collection methods rather than MutableList.

1 files changed, 3 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
index 73f5ec7b3c..1cd1b63691 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
@@ -217,12 +217,12 @@ abstract class TreeBuilder {
             atPos(cpos) {
               ClassDef(
                 Modifiers(FINAL), x, Nil,
-                Template(parents, self, NoMods, List(Nil), argss, stats, cpos.focus))
+                Template(parents, self, NoMods, ListOfNil, argss, stats, cpos.focus))
             }),
           atPos(npos) {
             New(
               Ident(x) setPos npos.focus,
-              List(Nil))
+              ListOfNil)
           }
         )
       }
@@ -546,10 +546,7 @@ abstract class TreeBuilder {
           rhs1,
           List(
             atPos(pat1.pos) {
-              def mkIdent(name: Name) = Ident(name)
-              CaseDef(pat1, EmptyTree, makeTupleTerm(vars map (_._1) map mkIdent, true))
-              // [Eugene++] no longer compiles after I moved the `Ident` case class into scala.reflect.internal
-              // CaseDef(pat1, EmptyTree, makeTupleTerm(vars map (_._1) map Ident, true))
+              CaseDef(pat1, EmptyTree, makeTupleTerm(vars map (_._1) map Ident.apply, true))
             }
           ))
       }