aboutsummaryrefslogtreecommitdiff
path: root/compiler/src/dotty/tools/dotc/typer/Typer.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2017-02-25 18:28:12 +0100
committerMartin Odersky <odersky@gmail.com>2017-02-27 15:45:48 +0100
commit1aa4b56c4813117f3be3a725c404c242eccefe10 (patch)
tree2fd534f987da9f0ac6410ccc3b752e1766546bf6 /compiler/src/dotty/tools/dotc/typer/Typer.scala
parentd0162aed64def280af8aa812514d101c1563fc28 (diff)
downloaddotty-1aa4b56c4813117f3be3a725c404c242eccefe10.tar.gz
dotty-1aa4b56c4813117f3be3a725c404c242eccefe10.tar.bz2
dotty-1aa4b56c4813117f3be3a725c404c242eccefe10.zip
Don't chain implicit conversions
When inferring a view, we are not allowed to use another implicit conversion to adapt its result. Fixing this revealed another problem where we have to re-enable implicit conversions when pre-typing arguments in overloading resolution.
Diffstat (limited to 'compiler/src/dotty/tools/dotc/typer/Typer.scala')
-rw-r--r--compiler/src/dotty/tools/dotc/typer/Typer.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
index 33e320ce5..57e3c1b88 100644
--- a/compiler/src/dotty/tools/dotc/typer/Typer.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -2023,7 +2023,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
// try an implicit conversion
inferView(tree, pt) match {
case SearchSuccess(inferred, _, _, _) =>
- adapt(inferred, pt)
+ adapt(inferred, pt)(ctx.retractMode(Mode.ImplicitsEnabled))
case failure: SearchFailure =>
if (pt.isInstanceOf[ProtoType] && !failure.isInstanceOf[AmbiguousImplicits]) tree
else err.typeMismatch(tree, pt, failure)