summaryrefslogtreecommitdiff
path: root/test/files/neg/static-annot.check
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2012-09-18 09:24:26 -0700
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2012-09-18 09:24:26 -0700
commita9f95dc29f366d935604f15a4a99cbfd1a1bd275 (patch)
treefdd532bc9caf0aabde01071c027cf66057d0a58e /test/files/neg/static-annot.check
parent61480eb14a07c78a6746d2a6dc1e302d5baa112f (diff)
parentfbed8130dc27250b5ea28b45a662479139d0d1f2 (diff)
downloadscala-a9f95dc29f366d935604f15a4a99cbfd1a1bd275.tar.gz
scala-a9f95dc29f366d935604f15a4a99cbfd1a1bd275.tar.bz2
scala-a9f95dc29f366d935604f15a4a99cbfd1a1bd275.zip
Merge pull request #1340 from gkossakowski/revert-static-annotation
Revert `@static` annotation
Diffstat (limited to 'test/files/neg/static-annot.check')
-rw-r--r--test/files/neg/static-annot.check22
1 files changed, 0 insertions, 22 deletions
diff --git a/test/files/neg/static-annot.check b/test/files/neg/static-annot.check
deleted file mode 100644
index c98e7d9658..0000000000
--- a/test/files/neg/static-annot.check
+++ /dev/null
@@ -1,22 +0,0 @@
-static-annot.scala:8: error: Only members of top-level objects and their nested objects can be annotated with @static.
- @static val bar = 1
- ^
-static-annot.scala:27: error: @static annotated field bar has the same name as a member of class Conflicting
- @static val bar = 1
- ^
-static-annot.scala:37: error: The @static annotation is only allowed on public members.
- @static private val bar = 1
- ^
-static-annot.scala:38: error: The @static annotation is only allowed on public members.
- @static private val baz = 2
- ^
-static-annot.scala:39: error: The @static annotation is not allowed on lazy members.
- @static lazy val bam = 3
- ^
-static-annot.scala:52: error: The @static annotation is not allowed on method definitions.
- @static def x = 42
- ^
-static-annot.scala:14: error: Only members of top-level objects and their nested objects can be annotated with @static.
- @static val blah = 2
- ^
-7 errors found