diff options
author | Paul Phillips <paulp@improving.org> | 2013-03-13 16:09:32 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-03-13 16:09:32 -0700 |
commit | 3fe7b8c0a8c86b38d010f37887092ce665f08df2 (patch) | |
tree | 38c90a7ffc3ded7dd13900a25bedc9b363855c30 /src/library | |
parent | a4c338888f4364dfd44989acd12cb72daf639081 (diff) | |
download | scala-3fe7b8c0a8c86b38d010f37887092ce665f08df2.tar.gz scala-3fe7b8c0a8c86b38d010f37887092ce665f08df2.tar.bz2 scala-3fe7b8c0a8c86b38d010f37887092ce665f08df2.zip |
SI-7247, deprecated NotNull.
Removed NotNull from tests and the parentage of AnyVal.
Removed the tests which were actually testing anything to
do with NotNull; massaged the others to forget NotNull and/or
not to name local things NotNull.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/AnyVal.scala | 2 | ||||
-rw-r--r-- | src/library/scala/NotNull.scala | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/library/scala/AnyVal.scala b/src/library/scala/AnyVal.scala index 0d6ba2454c..9def6cb054 100644 --- a/src/library/scala/AnyVal.scala +++ b/src/library/scala/AnyVal.scala @@ -52,6 +52,6 @@ package scala * as well as in [[http://docs.scala-lang.org/sips/pending/value-classes.html SIP-15: Value Classes]], * the Scala Improvement Proposal. */ -abstract class AnyVal extends Any with NotNull { +abstract class AnyVal extends Any { def getClass(): Class[_ <: AnyVal] = null } diff --git a/src/library/scala/NotNull.scala b/src/library/scala/NotNull.scala index f87416b49d..3cbe9ed4ac 100644 --- a/src/library/scala/NotNull.scala +++ b/src/library/scala/NotNull.scala @@ -12,4 +12,6 @@ package scala * A marker trait for things that are not allowed to be null * @since 2.5 */ + +@deprecated("This trait will be removed", "2.11.0") trait NotNull extends Any {} |