summaryrefslogtreecommitdiff
path: root/src/library/scala/Predef.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-12-04 21:32:58 +0000
committerPaul Phillips <paulp@improving.org>2010-12-04 21:32:58 +0000
commit626e38940b72f5e8445ecbece4d41996b5e2842e (patch)
treecb95f17cc56b79dddcf621b92982e332527b78aa /src/library/scala/Predef.scala
parent32ca2f2be6a027e2112bc1f8e10f99571caa4a8c (diff)
downloadscala-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.
Diffstat (limited to 'src/library/scala/Predef.scala')
-rw-r--r--src/library/scala/Predef.scala7
1 files changed, 3 insertions, 4 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}