summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-07-09 11:46:32 +0200
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-07-17 15:46:41 +0200
commita7407468be46799619f1b7ebe1f0975f3a6c2dbb (patch)
tree97544c5a26546fbfad6ca745e8458a26330d932e /src/compiler/scala/tools/nsc/typechecker/Implicits.scala
parent3fd4f47d7609e8818ea97e29e86af8b5ef09be9e (diff)
downloadscala-a7407468be46799619f1b7ebe1f0975f3a6c2dbb.tar.gz
scala-a7407468be46799619f1b7ebe1f0975f3a6c2dbb.tar.bz2
scala-a7407468be46799619f1b7ebe1f0975f3a6c2dbb.zip
Clarify divergentError comment
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Implicits.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
index 6b5a70bffb..98cf9c7830 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -857,7 +857,8 @@ trait Implicits {
SearchFailure
} else {
if (search.isFailure) {
- // We don't want errors that occur during checking implicit info
+ // Discard the divergentError we saved (if any), as well as all errors that are not of type DivergentImplicitTypeError
+ // We don't want errors that occur while checking the implicit info
// to influence the check of further infos, but we should retain divergent implicit errors
// (except for the one we already squirreled away)
val saved = divergentError.getOrElse(null)