Merge pull request #1357 from paulp/merge-210

Merge 2.10 into master.

1 files changed, 0 insertions, 53 deletions

diff --git a/test/files/neg/static-annot.scala b/test/files/neg/static-annot.scala
deleted file mode 100644
index c0b5ed30d8..0000000000
--- a/test/files/neg/static-annot.scala
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-import annotation.static
-
-
-
-class StaticInClass {
-  @static val bar = 1
-}
-
-
-class NestedObjectInClass {
-  object Nested {
-    @static val blah = 2
-  }
-}
-
-
-object NestedObjectInObject {
-  object Nested {
-    @static val succeed = 3
-  }
-}
-
-
-object Conflicting {
-  @static val bar = 1
-}
-
-
-class Conflicting {
-  val bar = 45
-}
-
-
-object PrivateProtectedLazy {
-  @static private val bar = 1
-  @static private val baz = 2
-  @static lazy val bam = 3
-}
-
-
-class PrivateProtectedLazy {
-  println(PrivateProtectedLazy.bar)
-  println(PrivateProtectedLazy.baz)
-  println(PrivateProtectedLazy.bam)
-}
-
-
-class StaticDef {
-  // this should not crash the compiler
-  @static def x = 42
-}