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 /test/files | |
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 'test/files')
-rw-r--r-- | test/files/pos/annotations.scala | 2 | ||||
-rw-r--r-- | test/files/pos/spec-annotations.scala | 2 | ||||
-rw-r--r-- | test/files/pos/t5223.scala | 2 | ||||
-rw-r--r-- | test/files/run/t5225_2.check | 2 | ||||
-rw-r--r-- | test/files/run/t5225_2.scala | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/test/files/pos/annotations.scala b/test/files/pos/annotations.scala index 501e2a6bd3..4832ce4ecd 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[@cloneable +T, U, V[_]] +abstract class C1[@annotation.elidable(0) +T, U, V[_]] abstract class C2[@deprecated @ann(1) T <: Number, V] diff --git a/test/files/pos/spec-annotations.scala b/test/files/pos/spec-annotations.scala index 6c1f737470..b23abf48e8 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[@cloneable +T, U, V[_]] +abstract class C1[@annotation.elidable(0) +T, U, V[_]] abstract class C2[@deprecated @ann(1) T <: Number, V] diff --git a/test/files/pos/t5223.scala b/test/files/pos/t5223.scala index 0b2528e367..d81daa9907 100644 --- a/test/files/pos/t5223.scala +++ b/test/files/pos/t5223.scala @@ -2,5 +2,5 @@ import scala.reflect.runtime.universe._ object Foo extends App { reify{def printf(format: String, args: Any*): String = null } - reify{def printf(format: String, args: Any*): String = ("abc": @cloneable)} + reify{def printf(format: String, args: Any*): String = ("abc": @deprecated)} }
\ No newline at end of file diff --git a/test/files/run/t5225_2.check b/test/files/run/t5225_2.check index 8ed54a14bb..477ea4eb6d 100644 --- a/test/files/run/t5225_2.check +++ b/test/files/run/t5225_2.check @@ -1,4 +1,4 @@ { - def foo(@new cloneable() x: Int) = ""; + def foo(@new elidable(0) x: Int) = ""; () } diff --git a/test/files/run/t5225_2.scala b/test/files/run/t5225_2.scala index d1b607499c..cf0f23a5c8 100644 --- a/test/files/run/t5225_2.scala +++ b/test/files/run/t5225_2.scala @@ -1,6 +1,6 @@ import scala.reflect.runtime.universe._ object Test extends App { - val tree = reify{def foo(@cloneable x: Int) = ""}.tree + val tree = reify{def foo(@annotation.elidable(0) x: Int) = ""}.tree println(tree.toString) }
\ No newline at end of file |