diff options
| author | Paul Phillips <paulp@improving.org> | 2010-12-06 04:04:56 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-12-06 04:04:56 +0000 |
| commit | 8922c4ed092a2fb4c3f6002f7c49d304f299cd02 (patch) | |
| tree | 7ca9c695328777ad292deac95b4c0347b6c38280 /test/files/run | |
| parent | b6db478a9641dd488f00fab0c0a113ef83fec5d3 (diff) | |
| download | scala-8922c4ed092a2fb4c3f6002f7c49d304f299cd02.tar.gz scala-8922c4ed092a2fb4c3f6002f7c49d304f299cd02.tar.bz2 scala-8922c4ed092a2fb4c3f6002f7c49d304f299cd02.zip | |
Moved ClassfileAnnotation/StaticAnnotation/Anno...
Moved ClassfileAnnotation/StaticAnnotation/Annotation/TypeConstraint
into scala.annotation and enabled the deprecated type aliases in scala.*
to point there. Also enclosed is a new starr to bootstrap. No review.
Diffstat (limited to 'test/files/run')
| -rw-r--r-- | test/files/run/constrained-types.check | 8 | ||||
| -rw-r--r-- | test/files/run/constrained-types.scala | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/files/run/constrained-types.check b/test/files/run/constrained-types.check index dbad841d99..dd21cf0c4e 100644 --- a/test/files/run/constrained-types.check +++ b/test/files/run/constrained-types.check @@ -1,4 +1,4 @@ -class Annot(obj: Any) extends Annotation with TypeConstraint +class Annot(obj: Any) extends annotation.Annotation with annotation.TypeConstraint defined class Annot ----- @@ -80,7 +80,7 @@ val stuff = m("stuff") // should not crash stuff: String @Annot("stuff") = stuff ----- -class peer extends Annotation // should not crash +class peer extends annotation.Annotation // should not crash defined class peer ----- @@ -108,7 +108,7 @@ def n(y: String) = { n: (y: String)java.lang.String @Annot(x) forSome { val x: String } ----- -class rep extends Annotation +class rep extends annotation.Annotation defined class rep ----- @@ -126,7 +126,7 @@ val x = 3 : Int @Annot(e+f+g+h) //should have a graceful error message ^ ----- -class Where(condition: Boolean) extends Annotation +class Where(condition: Boolean) extends annotation.Annotation defined class Where ----- diff --git a/test/files/run/constrained-types.scala b/test/files/run/constrained-types.scala index 62abfe9e31..86fcaade6e 100644 --- a/test/files/run/constrained-types.scala +++ b/test/files/run/constrained-types.scala @@ -10,7 +10,7 @@ import scala.Console object Test { val testCode = List( - "class Annot(obj: Any) extends Annotation with TypeConstraint", + "class Annot(obj: Any) extends annotation.Annotation with annotation.TypeConstraint", """class A { | val x = "hello" @@ -54,7 +54,7 @@ object Test { """val stuff = m("stuff") // should not crash""", - """class peer extends Annotation // should not crash""", // reported by Manfred Stock + """class peer extends annotation.Annotation // should not crash""", // reported by Manfred Stock """class NPE[T <: NPE[T] @peer] // should not crash""", // reported by Manfred Stock """def m = { @@ -73,13 +73,13 @@ object Test { | m("stuff".stripMargin) |} // x should be existentially bound""", - "class rep extends Annotation", + "class rep extends annotation.Annotation", """object A { val x = "hello" : String @ rep }""", "val y = a.x // should drop the annotation", "val x = 3 : Int @Annot(e+f+g+h) //should have a graceful error message", - "class Where(condition: Boolean) extends Annotation", + "class Where(condition: Boolean) extends annotation.Annotation", "val x : Int @Where(self > 0 && self < 100) = 3" ).map(_.stripMargin) |