Merge pull request #3152 from paulp/pr/deprecations

Removing deprecated code.

6 files changed, 5 insertions, 160 deletions

diff --git a/src/compiler/scala/reflect/macros/compiler/Resolvers.scala b/src/compiler/scala/reflect/macros/compiler/Resolvers.scala
index 03d306f593..e4851632a5 100644
--- a/src/compiler/scala/reflect/macros/compiler/Resolvers.scala
+++ b/src/compiler/scala/reflect/macros/compiler/Resolvers.scala
@@ -9,7 +9,7 @@ trait Resolvers {
 
   import global._
   import analyzer._
-  import definitions.{EmptyPackageClass => _, _}
+  import definitions._
   import treeInfo._
   import gen._
   private val runDefinitions = currentRun.runDefinitions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
index 217d2b6835..e92f8c2541 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
@@ -293,7 +293,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters with GenJVMASM {
   def inameToSymbol(iname: String): Symbol = {
     val name = global.newTypeName(iname)
     val res0 =
-      if (nme.isModuleName(name)) rootMirror.getModule(name.dropModule)
+      if (nme.isModuleName(name)) rootMirror.getModuleByName(name.dropModule)
       else                        rootMirror.getClassByName(name.replace('/', '.')) // TODO fails for inner classes (but this hasn't been tested).
     assert(res0 != NoSymbol)
     val res = jsymbol(res0)
diff --git a/src/compiler/scala/tools/nsc/reporters/Reporter.scala b/src/compiler/scala/tools/nsc/reporters/Reporter.scala
index 0544da5d3c..68362c066d 100644
--- a/src/compiler/scala/tools/nsc/reporters/Reporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/Reporter.scala
@@ -80,10 +80,4 @@ abstract class Reporter {
     WARNING.count     = 0
     cancelled         = false
   }
-
-  // sbt compat
-  @deprecated("Moved to scala.reflect.internal.util.StringOps", "2.10.0")
-  def countElementsAsString(n: Int, elements: String): String = StringOps.countElementsAsString(n, elements)
-  @deprecated("Moved to scala.reflect.internal.util.StringOps", "2.10.0")
-  def countAsString(n: Int): String = StringOps.countAsString(n)
 }
diff --git a/src/compiler/scala/tools/nsc/scratchpad/Mixer.scala b/src/compiler/scala/tools/nsc/scratchpad/Mixer.scala
deleted file mode 100644
index 3aecc06b1e..0000000000
--- a/src/compiler/scala/tools/nsc/scratchpad/Mixer.scala
+++ /dev/null
@@ -1,99 +0,0 @@
-package scala.tools.nsc.scratchpad
-
-import java.io.{FileInputStream, InputStreamReader, IOException}
-
-import scala.collection.mutable.ArrayBuffer
-
-@deprecated("SI-6458: Instrumentation logic will be moved out of the compiler.","2.10.0")
-class Mixer {
-
-  protected val stdSeparator = "//> "
-  protected val ctdSeparator = "//| "
-  protected val sepColumn = 50
-  protected val tabInc = 8
-
-  type Comments = Seq[(Int, Array[Char])]
-
-  def parseComments(comments: Array[Char]): Iterator[(Int, Array[Char])] = new Iterator[(Int, Array[Char])] {
-    var idx = 0
-    def hasNext = idx < comments.length
-    def next() = {
-      val nextSpace = comments indexOf (' ', idx)
-      var nextNL = comments indexOf ('\n', nextSpace + 1)
-      if (nextNL < 0) nextNL = comments.length
-      val result =
-        (new String(comments.slice(idx, nextSpace)).toInt, comments.slice(nextSpace + 1, nextNL))
-      idx = nextNL + 1
-      result
-    }
-  }
-
-  def mix(source: Array[Char], comments: Array[Char]): Array[Char] = {
-    val mixed = new ArrayBuffer[Char]
-    var written = 0
-    def align() = {
-      var idx = mixed.lastIndexOf('\n') + 1
-      var col = 0
-      while (idx < mixed.length) {
-        col =
-          if (mixed(idx) == '\t') (col / tabInc) * tabInc + tabInc
-          else col + 1
-        idx += 1
-      }
-      if (col > sepColumn) {
-        mixed += '\n'
-        col = 0
-      }
-      while (col < sepColumn) {
-        mixed += ' '
-        col += 1
-      }
-    }
-    for ((offset, cs) <- parseComments(comments)) {
-      val sep =
-        if (written < offset) {
-          for (i <- written until offset) mixed += source(i)
-          written = offset
-          stdSeparator
-        } else {
-          mixed += '\n'
-          ctdSeparator
-        }
-      align()
-      mixed ++= sep ++= cs
-    }
-    mixed ++= source.view(written, source.length)
-    mixed.toArray
-  }
-
-}
-
-object Mixer extends Mixer {
-
-  def contents(name: String): Array[Char] = {
-    val page = new Array[Char](2 << 14)
-    val buf = new ArrayBuffer[Char]
-    val in = new FileInputStream(name)
-    val rdr = new InputStreamReader(in)
-    var nread = 0
-    do {
-      nread = rdr.read(page, 0, page.length)
-      buf ++= (if (nread == page.length) page else page.take(nread))
-    } while (nread >= 0)
-    buf.toArray
-  }
-
-  def main(args: Array[String]) {
-    val mixer = new Mixer
-    try {
-      require(args.length == 2, "required arguments: file1 file2")
-      val source = contents(args(0))
-      val comments = contents(args(1))
-      val mixed = mixer.mix(source, comments)
-      println(mixed.mkString)
-    } catch {
-      case ex: IOException =>
-        println("error: "+ ex.getMessage)
-    }
-  }
-}
diff --git a/src/compiler/scala/tools/nsc/scratchpad/SourceInserter.scala b/src/compiler/scala/tools/nsc/scratchpad/SourceInserter.scala
deleted file mode 100644
index 61c1717fea..0000000000
--- a/src/compiler/scala/tools/nsc/scratchpad/SourceInserter.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-package scala.tools.nsc
-package scratchpad
-
-import scala.reflect.internal.Chars._
-
-@deprecated("SI-6458: Instrumentation logic will be moved out of the compiler.","2.10.0")
-object SourceInserter {
-  def stripRight(cs: Array[Char]): Array[Char] = {
-    val lines =
-      new String(cs) split "\n"
-    def leftPart(str: String) =
-      (str split """//>|//\|""").head
-    def isContinuation(str: String) =
-      ((str contains "//>") || (str contains "//|")) && (leftPart(str) forall isWhitespace)
-    def stripTrailingWS(str: String) =
-      str take (str lastIndexWhere (!isWhitespace(_))) + 1
-    val prefixes =
-      lines filterNot isContinuation map leftPart map stripTrailingWS
-    (prefixes mkString "\n").toArray
-  }
-}
diff --git a/src/compiler/scala/tools/nsc/util/package.scala b/src/compiler/scala/tools/nsc/util/package.scala
index cb46004174..4237f36ade 100644
--- a/src/compiler/scala/tools/nsc/util/package.scala
+++ b/src/compiler/scala/tools/nsc/util/package.scala
@@ -90,51 +90,22 @@ package object util {
 
   lazy val trace = new SimpleTracer(System.out)
 
-  @deprecated("Moved to scala.reflect.internal.util.StringOps", "2.10.0")
-  val StringOps = scala.reflect.internal.util.StringOps
-
-  @deprecated("Moved to scala.reflect.internal.util.StringOps", "2.10.0")
-  type StringOps = scala.reflect.internal.util.StringOps
-
-  @deprecated("scala.reflect.internal.util.WeakHashSet", "2.10.0")
-  type WeakHashSet[T <: AnyRef] = scala.reflect.internal.util.WeakHashSet[T]
-
-  @deprecated("Moved to scala.reflect.internal.util.Position", "2.10.0")
-  val Position = scala.reflect.internal.util.Position
-
+  // These four deprecated since 2.10.0 are still used in (at least)
+  // the sbt 0.12.4 compiler interface.
   @deprecated("Moved to scala.reflect.internal.util.Position", "2.10.0")
   type Position = scala.reflect.internal.util.Position
-
   @deprecated("Moved to scala.reflect.internal.util.NoPosition", "2.10.0")
   val NoPosition = scala.reflect.internal.util.NoPosition
-
   @deprecated("Moved to scala.reflect.internal.util.FakePos", "2.10.0")
   val FakePos = scala.reflect.internal.util.FakePos
-
   @deprecated("Moved to scala.reflect.internal.util.FakePos", "2.10.0")
   type FakePos = scala.reflect.internal.util.FakePos
 
-  @deprecated("Moved to scala.reflect.internal.util.OffsetPosition", "2.10.0")
-  type OffsetPosition = scala.reflect.internal.util.OffsetPosition
-
+  // These three were still used in scala-refactoring.
   @deprecated("Moved to scala.reflect.internal.util.RangePosition", "2.10.0")
   type RangePosition = scala.reflect.internal.util.RangePosition
-
   @deprecated("Moved to scala.reflect.internal.util.SourceFile", "2.10.0")
   type SourceFile = scala.reflect.internal.util.SourceFile
-
-  @deprecated("Moved to scala.reflect.internal.util.NoSourceFile", "2.10.0")
-  val NoSourceFile = scala.reflect.internal.util.NoSourceFile
-
-  @deprecated("Moved to scala.reflect.internal.util.NoFile", "2.10.0")
-  val NoFile = scala.reflect.internal.util.NoFile
-
-  @deprecated("Moved to scala.reflect.internal.util.ScriptSourceFile", "2.10.0")
-  val ScriptSourceFile = scala.reflect.internal.util.ScriptSourceFile
-
-  @deprecated("Moved to scala.reflect.internal.util.ScriptSourceFile", "2.10.0")
-  type ScriptSourceFile = scala.reflect.internal.util.ScriptSourceFile
-
   @deprecated("Moved to scala.reflect.internal.util.BatchSourceFile", "2.10.0")
   type BatchSourceFile = scala.reflect.internal.util.BatchSourceFile