diff options
| author | Stefan Zeiger <szeiger@novocode.com> | 2016-08-29 20:24:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 20:24:02 +0200 |
| commit | cf23cbcdd01383a929af3714329b48a7b8e1de39 (patch) | |
| tree | abbc8c9a8fd31f4f5c527b9d8fcfdbffa1a517ed | |
| parent | ad9129a94e86a5a37c982e4ef94d37e9325070d0 (diff) | |
| parent | 461bcda170c423bbdbb3ee2edba3d59fb0360fd0 (diff) | |
| download | scala-cf23cbcdd01383a929af3714329b48a7b8e1de39.tar.gz scala-cf23cbcdd01383a929af3714329b48a7b8e1de39.tar.bz2 scala-cf23cbcdd01383a929af3714329b48a7b8e1de39.zip | |
Merge pull request #5366 from som-snytt/issue/6967-removals
SI-6967 Primitive ClassTag.unapply is removed
| -rw-r--r-- | src/library/scala/reflect/ClassTag.scala | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/library/scala/reflect/ClassTag.scala b/src/library/scala/reflect/ClassTag.scala index 3a300e0593..eb3aeeecfc 100644 --- a/src/library/scala/reflect/ClassTag.scala +++ b/src/library/scala/reflect/ClassTag.scala @@ -83,21 +83,6 @@ trait ClassTag[T] extends ClassManifestDeprecatedApis[T] with Equals with Serial ) Some(x.asInstanceOf[T]) else None - // TODO: deprecate overloads in 2.12.0, remove in 2.13.0 - def unapply(x: Byte) : Option[T] = unapplyImpl(x, classOf[Byte]) - def unapply(x: Short) : Option[T] = unapplyImpl(x, classOf[Short]) - def unapply(x: Char) : Option[T] = unapplyImpl(x, classOf[Char]) - def unapply(x: Int) : Option[T] = unapplyImpl(x, classOf[Int]) - def unapply(x: Long) : Option[T] = unapplyImpl(x, classOf[Long]) - def unapply(x: Float) : Option[T] = unapplyImpl(x, classOf[Float]) - def unapply(x: Double) : Option[T] = unapplyImpl(x, classOf[Double]) - def unapply(x: Boolean) : Option[T] = unapplyImpl(x, classOf[Boolean]) - def unapply(x: Unit) : Option[T] = unapplyImpl(x, classOf[Unit]) - - private[this] def unapplyImpl(x: Any, primitiveCls: java.lang.Class[_]): Option[T] = - if (runtimeClass.isInstance(x) || runtimeClass.isAssignableFrom(primitiveCls)) Some(x.asInstanceOf[T]) - else None - // case class accessories override def canEqual(x: Any) = x.isInstanceOf[ClassTag[_]] override def equals(x: Any) = x.isInstanceOf[ClassTag[_]] && this.runtimeClass == x.asInstanceOf[ClassTag[_]].runtimeClass |