summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2012-11-01 09:56:17 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2012-11-01 09:56:17 -0700
commit999918311b7bf764916431485cb11043f1c220ed (patch)
tree9df1a526619025705833eb8a5ca1393c9dfeba5f /test/files
parent290220bc6f5e1a11e38c67eb3e51ec617f96a1f6 (diff)
parent1e2328ea6a8b592b5a2abe3557dc633e96f688f2 (diff)
downloadscala-999918311b7bf764916431485cb11043f1c220ed.tar.gz
scala-999918311b7bf764916431485cb11043f1c220ed.tar.bz2
scala-999918311b7bf764916431485cb11043f1c220ed.zip
Merge pull request #1551 from adriaanm/paulp-issue-6597-2.10.x
Fix for SI-6597, implicit case class crasher.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/t6597.check4
-rw-r--r--test/files/neg/t6597.scala5
2 files changed, 9 insertions, 0 deletions
diff --git a/test/files/neg/t6597.check b/test/files/neg/t6597.check
new file mode 100644
index 0000000000..1d52519d1d
--- /dev/null
+++ b/test/files/neg/t6597.check
@@ -0,0 +1,4 @@
+t6597.scala:3: error: illegal combination of modifiers: implicit and case for: class Quux
+ implicit case class Quux(value: Int) extends AnyVal with T
+ ^
+one error found
diff --git a/test/files/neg/t6597.scala b/test/files/neg/t6597.scala
new file mode 100644
index 0000000000..dde53bcc89
--- /dev/null
+++ b/test/files/neg/t6597.scala
@@ -0,0 +1,5 @@
+object Test {
+ trait T extends Any
+ implicit case class Quux(value: Int) extends AnyVal with T
+ object Quux
+}