summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-11-17 12:41:01 +0100
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-11-17 12:41:01 +0100
commitb9c89cc28409e8a516b9f67350010a4203678db5 (patch)
tree1e99916e8305d3297ed92dcf14b40cdf033d71c5 /test/files
parentebf16c7ef273206223674b3c72cd7a24a14bfa65 (diff)
parent3a4d4dbd366490b5bcbbd6091eb5947a23655600 (diff)
downloadscala-b9c89cc28409e8a516b9f67350010a4203678db5.tar.gz
scala-b9c89cc28409e8a516b9f67350010a4203678db5.tar.bz2
scala-b9c89cc28409e8a516b9f67350010a4203678db5.zip
Merge pull request #4117 from retronym/ticket/8449
SI-8449 Fix spurious error with Java raw type over a Scala class
Diffstat (limited to 'test/files')
-rw-r--r--test/files/t8449/Client.scala3
-rw-r--r--test/files/t8449/Test.java10
2 files changed, 13 insertions, 0 deletions
diff --git a/test/files/t8449/Client.scala b/test/files/t8449/Client.scala
new file mode 100644
index 0000000000..5d273f06b2
--- /dev/null
+++ b/test/files/t8449/Client.scala
@@ -0,0 +1,3 @@
+object Client {
+ def foo: Any = new Test().foo
+}
diff --git a/test/files/t8449/Test.java b/test/files/t8449/Test.java
new file mode 100644
index 0000000000..ecb1711b24
--- /dev/null
+++ b/test/files/t8449/Test.java
@@ -0,0 +1,10 @@
+public class Test {
+ // Raw type over a Scala type constructor
+ public scala.Function1 foo() { return null; }
+ // scalac reported:
+ // % scalac-hash v2.11.2 -d /tmp sandbox/{Test.java,Client.scala}
+ // sandbox/Test.java:2: error: trait Function1 takes type parameters
+ // public scala.Function1 foo() { return null; }
+ // ^
+ // one error found
+}