summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-10-08 16:23:36 -0700
committerPaul Phillips <paulp@improving.org>2012-10-08 16:36:55 -0700
commitd1a35ccf001301881dac2baca972234d8e4d8d25 (patch)
treed80e302ca3d0caceb53e54cb26ddf38b65ec1478 /src/compiler/scala/tools/nsc/typechecker/Typers.scala
parent6d6e328bfe0a458b556e91a99019c81673860db5 (diff)
downloadscala-d1a35ccf001301881dac2baca972234d8e4d8d25.tar.gz
scala-d1a35ccf001301881dac2baca972234d8e4d8d25.tar.bz2
scala-d1a35ccf001301881dac2baca972234d8e4d8d25.zip
Possible fix for continuations bug.
It comes looking for an implicit from (A @foo) => B and gives up, despite the fact that there is an implicit from A => B. Maybe there is some good reason for this, and/or I would fully believe there is a better way to fix it, but I'll propose this and wait to hear about the good reason and/or better way.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index c832987de5..688b4b5160 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -194,7 +194,7 @@ trait Typers extends Modes with Adaptations with Tags {
case PolyType(_, _) => EmptyTree
case _ =>
def wrapImplicit(from: Type): Tree = {
- val result = inferImplicit(tree, functionType(from :: Nil, to), reportAmbiguous, true, context, saveErrors)
+ val result = inferImplicit(tree, functionType(from.withoutAnnotations :: Nil, to), reportAmbiguous, true, context, saveErrors)
if (result.subst != EmptyTreeTypeSubstituter) {
result.subst traverse tree
notifyUndetparamsInferred(result.subst.from, result.subst.to)