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, 2 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/ast/TreeGen.scala b/src/compiler/scala/tools/nsc/ast/TreeGen.scala
index d7352045f5..3ccd8ec4ae 100644
--- a/src/compiler/scala/tools/nsc/ast/TreeGen.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreeGen.scala
@@ -44,7 +44,7 @@ abstract class TreeGen extends reflect.internal.TreeGen with TreeDSL {
           setInfo analyzer.ImportType(qual)
     )
     val importTree = (
-      Import(qual, List(ImportSelector(nme.WILDCARD, -1, null, -1)))
+      Import(qual, ImportSelector.wildList)
         setSymbol importSym
           setType NoType
     )
@@ -58,7 +58,7 @@ abstract class TreeGen extends reflect.internal.TreeGen with TreeDSL {
   def mkUnchecked(expr: Tree): Tree = atPos(expr.pos) {
     // This can't be "Annotated(New(UncheckedClass), expr)" because annotations
     // are very picky about things and it crashes the compiler with "unexpected new".
-    Annotated(New(scalaDot(UncheckedClass.name), List(Nil)), expr)
+    Annotated(New(scalaDot(UncheckedClass.name), ListOfNil), expr)
   }
   // if it's a Match, mark the selector unchecked; otherwise nothing.
   def mkUncheckedMatch(tree: Tree) = tree match {