From 180dfdc7e81d632e599fb0a545025720e8000573 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 8 Mar 2017 13:51:44 +0100 Subject: Fix condition logic I introduced an error in the refactoring two commits ago. --- compiler/src/dotty/tools/dotc/typer/Implicits.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler') diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index e1e4a9259..6dbb2216c 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -113,7 +113,7 @@ object Implicits { if (ctx.scala2Mode) tpw.derivesFrom(defn.FunctionClass(1)) else tpw.isRef(defn.FunctionClass(1)) val isConforms = - tpw.derivesFrom(defn.Predef_Conforms) || ref.symbol == defn.Predef_conforms + tpw.derivesFrom(defn.Predef_Conforms) && ref.symbol != defn.Predef_conforms !(isFunction || isConforms) } -- cgit v1.2.3