diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2013-01-17 19:55:42 +0100 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2013-01-17 20:52:24 +0100 |
| commit | 167fc0acb9bc75f3f378d2bfbabd61a2782a3568 (patch) | |
| tree | 0e8a6abbda1a632269544fd61d3f828d28a65f1d /src/compiler | |
| parent | 4805b97b62b00b39fee55ee9855ae8c046f5d621 (diff) | |
| download | scala-167fc0acb9bc75f3f378d2bfbabd61a2782a3568.tar.gz scala-167fc0acb9bc75f3f378d2bfbabd61a2782a3568.tar.bz2 scala-167fc0acb9bc75f3f378d2bfbabd61a2782a3568.zip | |
SI-6811 Remove usages of scala.annotation.cloneable
The source file itself will be removed later,
because the compiler seems to need it for boot-strapping.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/SyntaxHigh.scala | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala index 92d732ed04..c1bd7fd389 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala @@ -1274,7 +1274,6 @@ abstract class GenASM extends SubComponent with BytecodeWriters with GenJVMASM { // Additional interface parents based on annotations and other cues def newParentForAttr(attr: Symbol): Option[Symbol] = attr match { - case CloneableAttr => Some(CloneableClass) case RemoteAttr => Some(RemoteInterfaceClass) case _ => None } diff --git a/src/compiler/scala/tools/nsc/doc/html/SyntaxHigh.scala b/src/compiler/scala/tools/nsc/doc/html/SyntaxHigh.scala index 2783a27811..db9edd165d 100644 --- a/src/compiler/scala/tools/nsc/doc/html/SyntaxHigh.scala +++ b/src/compiler/scala/tools/nsc/doc/html/SyntaxHigh.scala @@ -29,8 +29,8 @@ private[html] object SyntaxHigh { /** Annotations, sorted alphabetically */ val annotations = Array( "BeanProperty", "SerialVersionUID", - "beanGetter", "beanSetter", "bridge", "cloneable", - "deprecated", "deprecatedName", + "beanGetter", "beanSetter", "bridge", + "deprecated", "deprecatedName", "deprecatedOverriding", "deprecatedInheritance", "elidable", "field", "getter", "inline", "migration", "native", "noinline", "param", "remote", "setter", "specialized", "strictfp", "switch", |