diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-10-02 08:04:16 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-10-02 08:04:16 -0700 |
| commit | e9edc69684b3d55a0aef16325e358036c71f4c57 (patch) | |
| tree | 6668c07c400d40bef8eaf2a1f19d9df8139fe8fb /src | |
| parent | 73c93db32434a259bfa340d1924a807613cf5154 (diff) | |
| parent | d61b0dbe8aca9a4d2568c4544a707cf7d778bc00 (diff) | |
| download | scala-e9edc69684b3d55a0aef16325e358036c71f4c57.tar.gz scala-e9edc69684b3d55a0aef16325e358036c71f4c57.tar.bz2 scala-e9edc69684b3d55a0aef16325e358036c71f4c57.zip | |
Merge pull request #1434 from jsuereth/fix/SI-6449
Fixes deprecation annotations for 2.10.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/CompilerControl.scala | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 708824ede1..12c3338e0d 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1047,7 +1047,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) * * @param sym A class symbol, object symbol, package, or package class. */ - @deprecated("use invalidateClassPathEntries instead") + @deprecated("use invalidateClassPathEntries instead", "2.10.0") def clearOnNextRun(sym: Symbol) = false /* To try out clearOnNext run on the scala.tools.nsc project itself * replace `false` above with the following code @@ -1305,7 +1305,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) /** Reset all classes contained in current project, as determined by * the clearOnNextRun hook */ - @deprecated("use invalidateClassPathEntries instead") + @deprecated("use invalidateClassPathEntries instead", "2.10.0") def resetProjectClasses(root: Symbol): Unit = try { def unlink(sym: Symbol) = if (sym != NoSymbol) root.info.decls.unlink(sym) diff --git a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala index 3de2359ce3..ae38a082ca 100644 --- a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala +++ b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala @@ -69,11 +69,11 @@ trait CompilerControl { self: Global => * if it does not yet exist create a new one atomically * Note: We want to get roid of this operation as it messes compiler invariants. */ - @deprecated("use getUnitOf(s) or onUnitOf(s) instead") + @deprecated("use getUnitOf(s) or onUnitOf(s) instead", "2.10.0") def unitOf(s: SourceFile): RichCompilationUnit = getOrCreateUnitOf(s) /** The compilation unit corresponding to a position */ - @deprecated("use getUnitOf(pos.source) or onUnitOf(pos.source) instead") + @deprecated("use getUnitOf(pos.source) or onUnitOf(pos.source) instead", "2.10.0") def unitOf(pos: Position): RichCompilationUnit = getOrCreateUnitOf(pos.source) /** Removes the CompilationUnit corresponding to the given SourceFile @@ -232,7 +232,7 @@ trait CompilerControl { self: Global => /** Tells the compile server to shutdown, and not to restart again */ def askShutdown() = scheduler raise ShutdownReq - @deprecated("use parseTree(source) instead") // deleted 2nd parameter, as this has to run on 2.8 also. + @deprecated("use parseTree(source) instead", "2.10.0") // deleted 2nd parameter, as this has to run on 2.8 also. def askParse(source: SourceFile, response: Response[Tree]) = respond(response) { parseTree(source) } |