summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala4
-rw-r--r--test/files/neg/t5452.check6
-rw-r--r--test/files/neg/t5452.scala29
3 files changed, 1 insertions, 38 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
index 466b5125a8..6ee09d064f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
@@ -714,11 +714,9 @@ trait ContextErrors {
setError(tree)
}
- def NoBestMethodAlternativeError(tree: Tree, argtpes: List[Type], pt: Type) = {
+ def NoBestMethodAlternativeError(tree: Tree, argtpes: List[Type], pt: Type) =
issueNormalTypeError(tree,
applyErrorMsg(tree, " cannot be applied to ", argtpes, pt))
- setError(tree)
- }
def AmbiguousMethodAlternativeError(tree: Tree, pre: Type, best: Symbol,
firstCompeting: Symbol, argtpes: List[Type], pt: Type) = {
diff --git a/test/files/neg/t5452.check b/test/files/neg/t5452.check
deleted file mode 100644
index baf544499b..0000000000
--- a/test/files/neg/t5452.check
+++ /dev/null
@@ -1,6 +0,0 @@
-t5452.scala:28: error: overloaded method value apply with alternatives:
-
- cannot be applied to (Queryable[CoffeesTable])
- Queryable[CoffeesTable]( q.treeFilter(null) )
- ^
-one error found
diff --git a/test/files/neg/t5452.scala b/test/files/neg/t5452.scala
deleted file mode 100644
index 1032db7a4b..0000000000
--- a/test/files/neg/t5452.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-// /scala/trac/5452/a.scala
-// Mon Feb 13 22:52:36 PST 2012
-
-// import scala.reflect.mirror._
-
-trait Tree
-
-object Bip {
- def ??? = sys.error("")
-}
-import Bip._
-
-case class Queryable[T]() {
- def treeFilter( t:Tree ) : Queryable[T] = ???
-}
-
-object Queryable {
- def apply[T:Manifest] = ???
- def apply[T:Manifest]( t:Tree ) = ???
-}
-
-trait CoffeesTable{
- def sales : Int
-}
-
-object Test extends App{
- val q = new Queryable[CoffeesTable]
- Queryable[CoffeesTable]( q.treeFilter(null) )
-}