diff options
author | Simon Ochsenreither <simon@ochsenreither.de> | 2012-09-21 21:14:19 +0200 |
---|---|---|
committer | Simon Ochsenreither <simon@ochsenreither.de> | 2012-10-08 05:24:41 +0200 |
commit | 17fd905e868db7de4c7f9046bb9c4937e281c1fe (patch) | |
tree | 52fa111b1d86d12f9bdf28e526b4f35ab6d2fc10 /src | |
parent | 7be1652cbf1300fe5fea44681a480c33467c2296 (diff) | |
download | scala-17fd905e868db7de4c7f9046bb9c4937e281c1fe.tar.gz scala-17fd905e868db7de4c7f9046bb9c4937e281c1fe.tar.bz2 scala-17fd905e868db7de4c7f9046bb9c4937e281c1fe.zip |
SI-6388 Remove deprecated items in the compiler jar
Deprecations in the following files were not removed to prevent SBT
from breaking:
- src/compiler/scala/tools/nsc/Interpreter.scala
- src/compiler/scala/tools/nsc/InterpreterLoop.scala
- src/compiler/scala/tools/nsc/interpreter/ILoop.scala
- src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
Diffstat (limited to 'src')
5 files changed, 2 insertions, 18 deletions
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala index b2f27d1925..00e374db62 100644 --- a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala +++ b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala @@ -39,7 +39,4 @@ class GenericRunnerSettings(error: String => Unit) extends Settings(error) { val nc = BooleanSetting( "-nc", "do not use the fsc compilation daemon") withAbbreviation "-nocompdaemon" - - @deprecated("Use `nc` instead", "2.9.0") def nocompdaemon = nc - @deprecated("Use `save` instead", "2.9.0") def savecompiled = save } diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index cb5e2ad555..f46ed54441 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1743,12 +1743,9 @@ class Global(var currentSettings: Settings, var reporter: Reporter) // deprecated method: but I see no simple way out, so I leave it for now. def forJVM = settings.target.value startsWith "jvm" override def forMSIL = settings.target.value startsWith "msil" - def forInteractive = onlyPresentation - def forScaladoc = onlyPresentation + def forInteractive = false + def forScaladoc = false def createJavadoc = false - - @deprecated("Use forInteractive or forScaladoc, depending on what you're after", "2.9.0") - def onlyPresentation = false } object Global { diff --git a/src/compiler/scala/tools/nsc/doc/model/Entity.scala b/src/compiler/scala/tools/nsc/doc/model/Entity.scala index a63849e3f6..fb3b7a7dc6 100644 --- a/src/compiler/scala/tools/nsc/doc/model/Entity.scala +++ b/src/compiler/scala/tools/nsc/doc/model/Entity.scala @@ -149,9 +149,6 @@ trait MemberEntity extends Entity { /** Some migration warning if this member has a migration annotation, or none otherwise. */ def migration: Option[Body] - @deprecated("Use `inDefinitionTemplates` instead", "2.9.0") - def inheritedFrom: List[TemplateEntity] - /** For members representing values: the type of the value returned by this member; for members * representing types: the type itself. */ def resultType: TypeEntity diff --git a/src/compiler/scala/tools/nsc/interpreter/IMain.scala b/src/compiler/scala/tools/nsc/interpreter/IMain.scala index 6d51dc1a39..92c2fc9768 100644 --- a/src/compiler/scala/tools/nsc/interpreter/IMain.scala +++ b/src/compiler/scala/tools/nsc/interpreter/IMain.scala @@ -187,8 +187,6 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends else null } } - @deprecated("Use `global` for access to the compiler instance.", "2.9.0") - lazy val compiler: global.type = global import global._ import definitions.{ScalaPackage, JavaLangPackage, termMember, typeMember} diff --git a/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala b/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala index 554a96d627..75774e3498 100644 --- a/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala +++ b/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala @@ -14,11 +14,6 @@ trait FreshNameCreator { */ def newName(): String def newName(prefix: String): String - - @deprecated("use newName(prefix)", "2.9.0") - def newName(pos: scala.reflect.internal.util.Position, prefix: String): String = newName(prefix) - @deprecated("use newName()", "2.9.0") - def newName(pos: scala.reflect.internal.util.Position): String = newName() } object FreshNameCreator { |