summaryrefslogtreecommitdiff
path: root/test/pending/neg
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-06-03 22:15:32 -0700
committerPaul Phillips <paulp@improving.org>2013-06-04 08:12:05 -0700
commit767a25fe2178b00f494d55bdaae53535cd7fb57d (patch)
tree1bae0553a051f6a8805391db9e75858fd297f3b6 /test/pending/neg
parentfb06073844f388ec4c007b4c08e7d508fc88d5ab (diff)
parente317d0bcc9fa8f2a2e6d93c4ad5edf5326f5a617 (diff)
downloadscala-767a25fe2178b00f494d55bdaae53535cd7fb57d.tar.gz
scala-767a25fe2178b00f494d55bdaae53535cd7fb57d.tar.bz2
scala-767a25fe2178b00f494d55bdaae53535cd7fb57d.zip
Merge branch 'pr/merge-2.10.2' into master
* pr/merge-2.10.2: SI-7375 ClassTag for value class aliases SI-7507 Fix lookup of private[this] member in presence of self type. 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" A test case for a recent LUB progression. SI-7421 remove unneeded extra-attachement in maven deploy SI-7486 Regressions in implicit search. SI-7509 Avoid crasher as erronous args flow through NamesDefaults SI-6138 Centralize and refine detection of `getClass` calls SI-7497 Fix scala.util.Properties.isMac SI-7473 Bad for expr crashes postfix Increase build.number to 2.10.3 SI-7391 Always use ForkJoin in Scala actors on ... ... Java 6 and above (except when the porperty actors.enableForkJoin says otherwise) Reimplementing much of the DefaultPromise methods Optimizations: 1) Avoiding to call 'synchronized' in tryComplete and in tryAwait 2) Implementing blocking by using an optimized latch so no blocking ops for non-blockers 3) Reducing method size of isCompleted to be cheaper to inline 4) 'result' to use Try.get instead of patmat c.typeCheck(silent = true) now suppresses ambiguous errors Conflicts: bincompat-backward.whitelist.conf bincompat-forward.whitelist.conf src/compiler/scala/reflect/macros/contexts/Typers.scala src/compiler/scala/reflect/reify/package.scala src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/compiler/scala/tools/reflect/ToolBoxFactory.scala src/library/scala/concurrent/impl/Promise.scala src/reflect/scala/reflect/internal/Types.scala
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
+}