summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2012-12-19 12:18:19 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2012-12-19 12:18:19 -0800
commitfc82bc69f1553f0b8def4a50240052366b37b411 (patch)
treec951cfe66a3a376d5a1b83912432c00ec5e52bc7 /test
parent12abf322d0540e0450ffdeb78e70de32c51339d5 (diff)
parentf029c3a141972b23e33310e23db72e0e602a46ca (diff)
downloadscala-fc82bc69f1553f0b8def4a50240052366b37b411.tar.gz
scala-fc82bc69f1553f0b8def4a50240052366b37b411.tar.bz2
scala-fc82bc69f1553f0b8def4a50240052366b37b411.zip
Merge pull request #1778 from JamesIry/p_SI-6795_2.10.x
SI-6795 simplify "abstract override" errors on type members
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t6795.check4
-rw-r--r--test/files/neg/t6795.scala3
2 files changed, 7 insertions, 0 deletions
diff --git a/test/files/neg/t6795.check b/test/files/neg/t6795.check
new file mode 100644
index 0000000000..88ef3e9a52
--- /dev/null
+++ b/test/files/neg/t6795.check
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..a523c89c82
--- /dev/null
+++ b/test/files/neg/t6795.scala
@@ -0,0 +1,3 @@
+trait T { type U }
+// "abstract override" shouldn't be allowed on types
+trait T1 extends T { abstract override type U = Int }