diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-11-29 18:35:15 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-11-29 18:35:15 +0100 |
| commit | eb6eb2cded84f0e0240f4b706c1ed41459946db2 (patch) | |
| tree | 856e852838e4b7f8d0cba707abf07f40361265ad /src/dotty/tools/dotc/typer/Typer.scala | |
| parent | 0581e8bac449ac720bd666e7f7fdb010d810a3cd (diff) | |
| download | dotty-eb6eb2cded84f0e0240f4b706c1ed41459946db2.tar.gz dotty-eb6eb2cded84f0e0240f4b706c1ed41459946db2.tar.bz2 dotty-eb6eb2cded84f0e0240f4b706c1ed41459946db2.zip | |
Tweaking Implicits
Still to do: catch cycles.
Diffstat (limited to 'src/dotty/tools/dotc/typer/Typer.scala')
| -rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 5a953004a..f0d4d7493 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -1034,7 +1034,7 @@ class Typer extends Namer with Applications with Implicits { val args = (wtp.paramNames, wtp.paramTypes).zipped map { (pname, formal) => def where = i"parameter $pname of $methodStr" inferImplicit(formal, EmptyTree, tree.pos.endPos) match { - case SearchSuccess(arg) => + case SearchSuccess(arg, _, _) => arg case ambi: AmbiguousImplicits => implicitArgError(s"ambiguous implicits: ${ambi.explanation} of $where") @@ -1084,7 +1084,7 @@ class Typer extends Namer with Applications with Implicits { } // try an implicit conversion inferView(tree, pt) match { - case SearchSuccess(adapted) => + case SearchSuccess(adapted, _, _) => adapted case failure: SearchFailure => if (pt.isInstanceOf[ProtoType]) tree |