summaryrefslogtreecommitdiff
path: root/test/pending/neg
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-06-03 22:13:38 -0700
committerPaul Phillips <paulp@improving.org>2013-06-03 22:13:38 -0700
commite317d0bcc9fa8f2a2e6d93c4ad5edf5326f5a617 (patch)
tree49f3009e24ebc993d390f3aecb9ed597d9931ee8 /test/pending/neg
parent1472dadd03496aa89624c81ded01edeb71420cc3 (diff)
parent60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a (diff)
downloadscala-e317d0bcc9fa8f2a2e6d93c4ad5edf5326f5a617.tar.gz
scala-e317d0bcc9fa8f2a2e6d93c4ad5edf5326f5a617.tar.bz2
scala-e317d0bcc9fa8f2a2e6d93c4ad5edf5326f5a617.zip
Merge remote-tracking branch 'origin/2.10.2' into pr/merge
* origin/2.10.2: SI-7532 Fix regression in Java inner classfile reader SI-7517 Fix higher kinded type inference regression SI-7516 Revert "SI-7234 Make named args play nice w. depmet types" SI-7486 Regressions in implicit search. SI-7509 Avoid crasher as erronous args flow through NamesDefaults
Diffstat (limited to 'test/pending/neg')
-rw-r--r--test/pending/neg/t7441.check6
-rw-r--r--test/pending/neg/t7441.scala7
2 files changed, 13 insertions, 0 deletions
diff --git a/test/pending/neg/t7441.check b/test/pending/neg/t7441.check
new file mode 100644
index 0000000000..f259457197
--- /dev/null
+++ b/test/pending/neg/t7441.check
@@ -0,0 +1,6 @@
+t7441.scala:4: error: type mismatch;
+ found : Int(1)
+ required: List[Any]
+ def test = apply(1)
+ ^
+one error found
diff --git a/test/pending/neg/t7441.scala b/test/pending/neg/t7441.scala
new file mode 100644
index 0000000000..dad7421e3f
--- /dev/null
+++ b/test/pending/neg/t7441.scala
@@ -0,0 +1,7 @@
+object Test {
+ object Bar {
+ def apply(xs: List[Any]): Int = 0
+ def test = apply(1)
+ }
+ implicit def foo = 1
+}