diff options
author | Paul Phillips <paulp@improving.org> | 2010-12-04 21:32:58 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-12-04 21:32:58 +0000 |
commit | 626e38940b72f5e8445ecbece4d41996b5e2842e (patch) | |
tree | cb95f17cc56b79dddcf621b92982e332527b78aa | |
parent | 32ca2f2be6a027e2112bc1f8e10f99571caa4a8c (diff) | |
download | scala-626e38940b72f5e8445ecbece4d41996b5e2842e.tar.gz scala-626e38940b72f5e8445ecbece4d41996b5e2842e.tar.bz2 scala-626e38940b72f5e8445ecbece4d41996b5e2842e.zip |
Remedied a return type oops in the system package.
Deprecated the rest of the elements with comments saying "deprecate me."
No review.
-rw-r--r-- | src/library/scala/Predef.scala | 7 | ||||
-rw-r--r-- | src/library/scala/package.scala | 2 | ||||
-rw-r--r-- | src/library/scala/system/package.scala | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index 7237c628d0..55a488f625 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -182,8 +182,8 @@ object Predef extends LowPriorityImplicits { def println() = Console.println() def println(x: Any) = Console.println(x) def printf(text: String, xs: Any*) = Console.print(format(text, xs: _*)) - // deprecation waiting for 2.9 - // @deprecated("Use formatString.format(args: _*) or arg.formatted(formatString) instead") + + @deprecated("Use formatString.format(args: _*) or arg.formatted(formatString) instead") def format(text: String, xs: Any*) = augmentString(text).format(xs: _*) def readLine(): String = Console.readLine() @@ -352,8 +352,7 @@ object Predef extends LowPriorityImplicits { } // less useful due to #2781 - // @deprecated("Use From => To instead") - // ...intended for 2.9 unless someone can point out anything <%< offers over => + @deprecated("Use From => To instead") sealed abstract class <%<[-From, +To] extends (From => To) object <%< { implicit def conformsOrViewsAs[A <% B, B]: A <%< B = new (A <%< B) {def apply(x: A) = x} diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala index 839ce4c5ea..2a30ce5061 100644 --- a/src/library/scala/package.scala +++ b/src/library/scala/package.scala @@ -75,7 +75,7 @@ package object scala { val $scope = scala.xml.TopScope - // @deprecated("Use Thread.currentThread instead") // waiting for 2.9 + @deprecated("Use Thread.currentThread instead") def currentThread = java.lang.Thread.currentThread() // Numeric types which were moved into scala.math.* diff --git a/src/library/scala/system/package.scala b/src/library/scala/system/package.scala index 4dc754d373..1e989f86ec 100644 --- a/src/library/scala/system/package.scala +++ b/src/library/scala/system/package.scala @@ -72,7 +72,7 @@ package object system { * @param the body of code to run at shutdown * @return the Thread which will run the shutdown hook. */ - def addShutdownHook(body: => Unit): Thread = ShutdownHookThread(body) + def addShutdownHook(body: => Unit): ShutdownHookThread = ShutdownHookThread(body) /** Returns all active thread in the current thread's thread group and subgroups. * |