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.

1 files changed, 4 insertions, 4 deletions

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)