diff options
| author | Adriaan Moors <adriaanm@gmail.com> | 2012-10-19 15:02:02 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaanm@gmail.com> | 2012-10-19 15:02:02 -0700 |
| commit | 2bd2a7c9506790d25d01c6e79e50a233b16c31ff (patch) | |
| tree | 4170bac08a9360c947d3eefbb58f19fac1f25044 /src/reflect | |
| parent | a9b9e44e3358aa9f09068895948c0a5a4d43965c (diff) | |
| parent | 18c6d58a5dc994ce19b0419c7c2dce460acecbdd (diff) | |
| download | scala-2bd2a7c9506790d25d01c6e79e50a233b16c31ff.tar.gz scala-2bd2a7c9506790d25d01c6e79e50a233b16c31ff.tar.bz2 scala-2bd2a7c9506790d25d01c6e79e50a233b16c31ff.zip | |
Merge pull request #1473 from soc/SI-6388-without-predef
SI-6388 Remove deprecated items scheduled for 2.11
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 5 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/Set.scala | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 7d0c05bc81..a2aed63609 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -709,10 +709,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => } def isStrictFP = hasAnnotation(ScalaStrictFPAttr) || (enclClass hasAnnotation ScalaStrictFPAttr) - def isSerializable = ( - info.baseClasses.exists(p => p == SerializableClass || p == JavaSerializableClass) - || hasAnnotation(SerializableAttr) // last part can be removed, @serializable annotation is deprecated - ) + def isSerializable = info.baseClasses.exists(p => p == SerializableClass || p == JavaSerializableClass) def hasBridgeAnnotation = hasAnnotation(BridgeClass) def isDeprecated = hasAnnotation(DeprecatedAttr) def deprecationMessage = getAnnotation(DeprecatedAttr) flatMap (_ stringArg 0) diff --git a/src/reflect/scala/reflect/internal/util/Set.scala b/src/reflect/scala/reflect/internal/util/Set.scala index d708a09de7..94743f2069 100644 --- a/src/reflect/scala/reflect/internal/util/Set.scala +++ b/src/reflect/scala/reflect/internal/util/Set.scala @@ -18,8 +18,6 @@ abstract class Set[T <: AnyRef] { def apply(x: T): Boolean = contains(x) - @deprecated("use `iterator` instead", "2.9.0") def elements = iterator - def contains(x: T): Boolean = findEntry(x) ne null |