diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2012-09-18 03:44:59 +0200 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2012-10-08 05:25:05 +0200 |
| commit | e3cec78518a0529152fe6beda3cc6c9a14ea0f9b (patch) | |
| tree | 698c3061231891efc96d10eb70792b857a6cf2db /test/files/pos | |
| parent | c52f91ca0db573fdfc879ae199a237db256d7523 (diff) | |
| download | scala-e3cec78518a0529152fe6beda3cc6c9a14ea0f9b.tar.gz scala-e3cec78518a0529152fe6beda3cc6c9a14ea0f9b.tar.bz2 scala-e3cec78518a0529152fe6beda3cc6c9a14ea0f9b.zip | |
SI-6388 Remove first parts of deprecated @serializable annotation
Diffstat (limited to 'test/files/pos')
| -rw-r--r-- | test/files/pos/annotations.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/attributes.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/spec-annotations.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/t1385.scala | 4 | ||||
| -rw-r--r-- | test/files/pos/t640.scala | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/test/files/pos/annotations.scala b/test/files/pos/annotations.scala index 706a715bad..501e2a6bd3 100644 --- a/test/files/pos/annotations.scala +++ b/test/files/pos/annotations.scala @@ -2,7 +2,7 @@ class ann(i: Int) extends scala.annotation.Annotation class cfann(x: String) extends annotation.ClassfileAnnotation // annotations on abstract types -abstract class C1[@serializable @cloneable +T, U, V[_]] +abstract class C1[@cloneable +T, U, V[_]] abstract class C2[@deprecated @ann(1) T <: Number, V] diff --git a/test/files/pos/attributes.scala b/test/files/pos/attributes.scala index ec735d0aae..60e00bff7d 100644 --- a/test/files/pos/attributes.scala +++ b/test/files/pos/attributes.scala @@ -1,3 +1,5 @@ +class serializable extends annotation.StaticAnnotation + @serializable class C1; @serializable @volatile class C2; @serializable @volatile class C3; diff --git a/test/files/pos/spec-annotations.scala b/test/files/pos/spec-annotations.scala index 48281e5df5..6c1f737470 100644 --- a/test/files/pos/spec-annotations.scala +++ b/test/files/pos/spec-annotations.scala @@ -1,7 +1,7 @@ class ann(i: Int) extends scala.annotation.Annotation // annotations on abstract types -abstract class C1[@serializable @cloneable +T, U, V[_]] +abstract class C1[@cloneable +T, U, V[_]] abstract class C2[@deprecated @ann(1) T <: Number, V] diff --git a/test/files/pos/t1385.scala b/test/files/pos/t1385.scala index 59953bcc39..6fe7308281 100644 --- a/test/files/pos/t1385.scala +++ b/test/files/pos/t1385.scala @@ -1,3 +1,3 @@ -@serializable object Test { - private def readResolve:AnyRef = this +object Test extends Serializable { + private def readResolve: AnyRef = this } diff --git a/test/files/pos/t640.scala b/test/files/pos/t640.scala index 55f61df8af..45608bc3d4 100644 --- a/test/files/pos/t640.scala +++ b/test/files/pos/t640.scala @@ -1,2 +1,2 @@ -@serializable class A -@serializable class B extends A +class A extends Serializable +class B extends A with Serializable |