aboutsummaryrefslogtreecommitdiff
path: root/compiler/src
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/src')
-rw-r--r--compiler/src/dotty/tools/dotc/typer/Implicits.scala2
1 files changed, 1 insertions, 1 deletions
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)
}