diff options
| author | Paul Phillips <paulp@improving.org> | 2012-08-17 09:14:09 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-08-17 09:14:09 -0700 |
| commit | b794f4a87f5217fd381f129cd75946a2ced6eb44 (patch) | |
| tree | 872c1c5b20effcc499a3b1141ab4d9c1900bf2a9 /src/scalap | |
| parent | 62d319e46ff672f523e266009025fe3723651229 (diff) | |
| parent | 7fc860963a4f76cb18e44c20f2bdfb49641033f3 (diff) | |
| download | scala-b794f4a87f5217fd381f129cd75946a2ced6eb44.tar.gz scala-b794f4a87f5217fd381f129cd75946a2ced6eb44.tar.bz2 scala-b794f4a87f5217fd381f129cd75946a2ced6eb44.zip | |
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.
Diffstat (limited to 'src/scalap')
| -rw-r--r-- | src/scalap/scala/tools/scalap/Main.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala index a8a9c65f63..49c272cc28 100644 --- a/src/scalap/scala/tools/scalap/Main.scala +++ b/src/scalap/scala/tools/scalap/Main.scala @@ -10,10 +10,10 @@ package scala.tools.scalap import java.io.{ PrintStream, OutputStreamWriter, ByteArrayOutputStream } import scala.reflect.NameTransformer import scalax.rules.scalasig._ -import tools.nsc.util.{ ClassPath, JavaClassPath } -import tools.util.PathResolver +import scala.tools.nsc.util.{ ClassPath, JavaClassPath } +import scala.tools.util.PathResolver import ClassPath.DefaultJavaContext -import tools.nsc.io.{ PlainFile, AbstractFile } +import scala.tools.nsc.io.{ PlainFile, AbstractFile } /**The main object used to execute scalap on the command-line. * |