5 files changed, 2 insertions, 35 deletions

diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index d2aa3a8b34..b84fcc4126 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -468,13 +468,6 @@ object Predef extends LowPriorityImplicits {
      implicit def tpEquals[A]: A =:= A = singleton_=:=.asInstanceOf[A =:= A]
   }
 
-  // less useful due to #2781
-  @deprecated("Use From => To instead", "2.9.0")
-  sealed abstract class <%<[-From, +To] extends (From => To) with Serializable
-  object <%< {
-    implicit def conformsOrViewsAs[A <% B, B]: A <%< B = new (A <%< B) {def apply(x: A) = x}
-  }
-
   /** A type for which there is always an implicit value.
    *  @see fallbackCanBuildFrom in Array.scala
    */
diff --git a/src/library/scala/collection/immutable/Range.scala b/src/library/scala/collection/immutable/Range.scala
index 3eb37e99fc..07c8df57ba 100644
--- a/src/library/scala/collection/immutable/Range.scala
+++ b/src/library/scala/collection/immutable/Range.scala
@@ -398,7 +398,4 @@ object Range {
     def apply(start: Int, end: Int, step: Int) = NumericRange(start, end, step)
     def inclusive(start: Int, end: Int, step: Int) = NumericRange.inclusive(start, end, step)
   }
-
-  @deprecated("use Range instead", "2.9.0")
-  trait ByOne extends Range
 }
diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala
index e50f854bc5..064ccd7735 100644
--- a/src/library/scala/package.scala
+++ b/src/library/scala/package.scala
@@ -80,10 +80,6 @@ package object scala {
   type Range = scala.collection.immutable.Range
   val Range = scala.collection.immutable.Range
 
-  // Migrated from Predef
-  @deprecated("Use Thread.currentThread instead", "2.9.0")
-  def currentThread = java.lang.Thread.currentThread()
-
   // Numeric types which were moved into scala.math.*
 
   type BigDecimal = scala.math.BigDecimal
@@ -127,13 +123,4 @@ package object scala {
   type unchecked = annotation.unchecked.unchecked
   type volatile = annotation.volatile
   */
-
-  @deprecated("use scala.annotation.Annotation instead", "2.9.0")
-  type Annotation = scala.annotation.Annotation
-  @deprecated("use scala.annotation.ClassfileAnnotation instead", "2.9.0")
-  type ClassfileAnnotation = scala.annotation.ClassfileAnnotation
-  @deprecated("use scala.annotation.StaticAnnotation instead", "2.9.0")
-  type StaticAnnotation = scala.annotation.StaticAnnotation
-  @deprecated("use scala.annotation.TypeConstraint instead", "2.9.0")
-  type TypeConstraint = scala.annotation.TypeConstraint
 }
diff --git a/src/library/scala/reflect/makro/internal/macroImpl.scala b/src/library/scala/reflect/makro/internal/macroImpl.scala
index 86600ba0a1..9cf4d23072 100644
--- a/src/library/scala/reflect/makro/internal/macroImpl.scala
+++ b/src/library/scala/reflect/makro/internal/macroImpl.scala
@@ -2,4 +2,4 @@ package scala.reflect.makro
 package internal
 
 /** This type is required by the compiler and <b>should not be used in client code</b>. */
-class macroImpl(val referenceToMacroImpl: Any) extends StaticAnnotation
+class macroImpl(val referenceToMacroImpl: Any) extends annotation.StaticAnnotation
diff --git a/src/library/scala/runtime/package.scala b/src/library/scala/runtime/package.scala
index 9c87baf6a7..e4472b3ea1 100644
--- a/src/library/scala/runtime/package.scala
+++ b/src/library/scala/runtime/package.scala
@@ -1,13 +1,3 @@
 package scala
 
-package object runtime {
-  @deprecated("Use `scala.Unit` instead.", "2.9.0")    val Unit    = scala.Unit
-  @deprecated("Use `scala.Boolean` instead.", "2.9.0") val Boolean = scala.Boolean
-  @deprecated("Use `scala.Byte` instead.", "2.9.0")    val Byte    = scala.Byte
-  @deprecated("Use `scala.Short` instead.", "2.9.0")   val Short   = scala.Short
-  @deprecated("Use `scala.Char` instead.", "2.9.0")    val Char    = scala.Char
-  @deprecated("Use `scala.Int` instead.", "2.9.0")     val Int     = scala.Int
-  @deprecated("Use `scala.Long` instead.", "2.9.0")    val Long    = scala.Long
-  @deprecated("Use `scala.Float` instead.", "2.9.0")   val Float   = scala.Float
-  @deprecated("Use `scala.Double` instead.", "2.9.0")  val Double  = scala.Double
-}
+package object runtime { }