summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-06-01 10:07:06 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2016-06-01 10:07:06 +0200
commit7f090f1551e24bef1ae3493313cfe3cd1cf613dd (patch)
treea163598cc6098d2b287518408782577a8c05e9fa /test/files/pos
parent608387529b790c2a0fc87b4cf5b5324d68d02648 (diff)
parent90706b0747dee8e2c35e86bec897a08776a61e6b (diff)
downloadscala-7f090f1551e24bef1ae3493313cfe3cd1cf613dd.tar.gz
scala-7f090f1551e24bef1ae3493313cfe3cd1cf613dd.tar.bz2
scala-7f090f1551e24bef1ae3493313cfe3cd1cf613dd.zip
Merge commit '90706b0' into merge-2.11-to-2.12-june-1
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/t8449/Client.scala3
-rw-r--r--test/files/pos/t8449/Test.java10
2 files changed, 13 insertions, 0 deletions
diff --git a/test/files/pos/t8449/Client.scala b/test/files/pos/t8449/Client.scala
new file mode 100644
index 0000000000..5d273f06b2
--- /dev/null
+++ b/test/files/pos/t8449/Client.scala
@@ -0,0 +1,3 @@
+object Client {
+ def foo: Any = new Test().foo
+}
diff --git a/test/files/pos/t8449/Test.java b/test/files/pos/t8449/Test.java
new file mode 100644
index 0000000000..ecb1711b24
--- /dev/null
+++ b/test/files/pos/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
+}