diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-03-08 13:51:44 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-03-08 17:50:20 +0100 |
| commit | 180dfdc7e81d632e599fb0a545025720e8000573 (patch) | |
| tree | 9c321ad164f7988cdaeb1ae1cd661973f26351cd /compiler/src/dotty/tools/dotc/typer | |
| parent | d1115f58e29a4de2f52933ab0f92326c660f5f70 (diff) | |
| download | dotty-180dfdc7e81d632e599fb0a545025720e8000573.tar.gz dotty-180dfdc7e81d632e599fb0a545025720e8000573.tar.bz2 dotty-180dfdc7e81d632e599fb0a545025720e8000573.zip | |
Fix condition logic
I introduced an error in the refactoring two commits ago.
Diffstat (limited to 'compiler/src/dotty/tools/dotc/typer')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/typer/Implicits.scala | 2 |
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) } |