SI-7469 Remove misc. @deprecated elements

4 files changed, 7 insertions, 24 deletions

diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 8900450fa3..ec587c158d 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -95,8 +95,6 @@ object Predef extends LowPriorityImplicits with DeprecatedPredef {
   type Set[A]     = immutable.Set[A]
   val Map         = immutable.Map
   val Set         = immutable.Set
-  // @deprecated("Use scala.AnyRef instead", "2.10.0")
-  // def AnyRef = scala.AnyRef
 
   // Manifest types, companions, and incantations for summoning
   @annotation.implicitNotFound(msg = "No ClassManifest available for ${T}.")
diff --git a/src/library/scala/collection/mutable/AVLTree.scala b/src/library/scala/collection/mutable/AVLTree.scala
index d2205f9994..de09bb2040 100644
--- a/src/library/scala/collection/mutable/AVLTree.scala
+++ b/src/library/scala/collection/mutable/AVLTree.scala
@@ -11,10 +11,10 @@ package collection
 package mutable
 
 /**
- * An immutable AVL Tree implementation used by mutable.TreeSet
+ * An immutable AVL Tree implementation formerly used by mutable.TreeSet
  *
  * @author Lucien Pereira
- * @deprecated("AVLTree and its related classes are being removed from the standard library since they're not different enough from RedBlackTree to justify keeping them.", "2.11")
+ * @deprecated("AVLTree and its related classes are being removed from the standard library since they're not different enough from RedBlackTree to justify keeping them.", "2.11.0")
  */
 private[mutable] sealed trait AVLTree[+A] extends Serializable {
   def balance: Int
@@ -65,7 +65,7 @@ private[mutable] sealed trait AVLTree[+A] extends Serializable {
 }
 
 /**
- * @deprecated("AVLTree and its related classes are being removed from the standard library since they're not different enough from RedBlackTree to justify keeping them.", "2.11")
+ * @deprecated("AVLTree and its related classes are being removed from the standard library since they're not different enough from RedBlackTree to justify keeping them.", "2.11.0")
  */
 private case object Leaf extends AVLTree[Nothing] {
   override val balance: Int = 0
@@ -74,7 +74,7 @@ private case object Leaf extends AVLTree[Nothing] {
 }
 
 /**
- * @deprecated("AVLTree and its related classes are being removed from the standard library since they're not different enough from RedBlackTree to justify keeping them.", "2.11")
+ * @deprecated("AVLTree and its related classes are being removed from the standard library since they're not different enough from RedBlackTree to justify keeping them.", "2.11.0")
  */
 private case class Node[A](data: A, left: AVLTree[A], right: AVLTree[A]) extends AVLTree[A] {
   override val balance: Int = right.depth - left.depth
@@ -211,7 +211,7 @@ private case class Node[A](data: A, left: AVLTree[A], right: AVLTree[A]) extends
 }
 
 /**
- * @deprecated("AVLTree and its related classes are being removed from the standard library since they're not different enough from RedBlackTree to justify keeping them.", "2.11")
+ * @deprecated("AVLTree and its related classes are being removed from the standard library since they're not different enough from RedBlackTree to justify keeping them.", "2.11.0")
  */
 private class AVLIterator[A](root: Node[A]) extends Iterator[A] {
   val stack = mutable.ArrayStack[Node[A]](root)
diff --git a/src/library/scala/io/Position.scala b/src/library/scala/io/Position.scala
index 85149223ee..011d0f17af 100644
--- a/src/library/scala/io/Position.scala
+++ b/src/library/scala/io/Position.scala
@@ -34,7 +34,7 @@ package io
  *  @author Burak Emir (translated from work by Matthias Zenger and others)
  */
 @deprecated("This class will be removed.", "2.10.0")
-abstract class Position {
+private[scala] abstract class Position {
   /** Definable behavior for overflow conditions.
    */
   def checkInput(line: Int, column: Int): Unit
@@ -68,7 +68,7 @@ abstract class Position {
   def toString(pos: Int): String = line(pos) + ":" + column(pos)
 }
 
-object Position extends Position {
+private[scala] object Position extends Position {
   def checkInput(line: Int, column: Int) {
     if (line < 0)
       throw new IllegalArgumentException(line + " < 0")
diff --git a/src/library/scala/reflect/package.scala b/src/library/scala/reflect/package.scala
index 74c1f2172c..509d181d87 100644
--- a/src/library/scala/reflect/package.scala
+++ b/src/library/scala/reflect/package.scala
@@ -61,21 +61,6 @@ package object reflect {
   // using the mechanism implemented in `scala.tools.reflect.FastTrack`
   // todo. once we have implicit macros for tag generation, we can remove this anchor
   private[scala] def materializeClassTag[T](): ClassTag[T] = macro ???
-
-  @deprecated("Use `@scala.beans.BeanDescription` instead", "2.10.0")
-  type BeanDescription = scala.beans.BeanDescription
-  @deprecated("Use `@scala.beans.BeanDisplayName` instead", "2.10.0")
-  type BeanDisplayName = scala.beans.BeanDisplayName
-  @deprecated("Use `@scala.beans.BeanInfo` instead", "2.10.0")
-  type BeanInfo = scala.beans.BeanInfo
-  @deprecated("Use `@scala.beans.BeanInfoSkip` instead", "2.10.0")
-  type BeanInfoSkip = scala.beans.BeanInfoSkip
-  @deprecated("Use `@scala.beans.BeanProperty` instead", "2.10.0")
-  type BeanProperty = scala.beans.BeanProperty
-  @deprecated("Use `@scala.beans.BooleanBeanProperty` instead", "2.10.0")
-  type BooleanBeanProperty = scala.beans.BooleanBeanProperty
-  @deprecated("Use `@scala.beans.ScalaBeanInfo` instead", "2.10.0")
-  type ScalaBeanInfo = scala.beans.ScalaBeanInfo
 }
 
 /** An exception that indicates an error during Scala reflection */