summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJames Iry <james.iry@typesafe.com>2012-12-10 15:22:49 -0800
committerJames Iry <james.iry@typesafe.com>2012-12-10 15:25:50 -0800
commitf029c3a141972b23e33310e23db72e0e602a46ca (patch)
tree1c144c372307439b2ae24a1509574ba50c364ae4 /test
parent71e42a799aa11fda75d9d3e7b92da9f61dd1da5b (diff)
downloadscala-f029c3a141972b23e33310e23db72e0e602a46ca.tar.gz
scala-f029c3a141972b23e33310e23db72e0e602a46ca.tar.bz2
scala-f029c3a141972b23e33310e23db72e0e602a46ca.zip
SI-6795 Simplify errors related to "abstract override" on type members
Instead of saying "only allowed on non-type members of traits" use separate errors for "not allowed on types" and "only allowed on members of traits"
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t6795.check2
-rw-r--r--test/files/neg/t6795.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/t6795.check b/test/files/neg/t6795.check
index 595eda4f22..88ef3e9a52 100644
--- a/test/files/neg/t6795.check
+++ b/test/files/neg/t6795.check
@@ -1,4 +1,4 @@
-t6795.scala:3: error: `abstract override' modifier only allowed for non-type members of traits
+t6795.scala:3: error: `abstract override' modifier not allowed for type members
trait T1 extends T { abstract override type U = Int }
^
one error found
diff --git a/test/files/neg/t6795.scala b/test/files/neg/t6795.scala
index a93be5bc7f..a523c89c82 100644
--- a/test/files/neg/t6795.scala
+++ b/test/files/neg/t6795.scala
@@ -1,3 +1,3 @@
trait T { type U }
// "abstract override" shouldn't be allowed on types
-trait T1 extends T { abstract override type U = Int } \ No newline at end of file
+trait T1 extends T { abstract override type U = Int }