diff options
| author | Paul Phillips <paulp@improving.org> | 2013-04-30 05:18:20 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-04-30 05:18:20 -0700 |
| commit | bf0db36d8bbb0ac7faa0652b98458cfebca8e78a (patch) | |
| tree | d3746ffa180541b3b7c6a60c5b1cd3bf272a7c37 /src/interactive | |
| parent | fc14edde4cd0dde064b78b0bde35adbfd561597d (diff) | |
| parent | 71581425746e9d3239998569d6f85c710efbf17b (diff) | |
| download | scala-bf0db36d8bbb0ac7faa0652b98458cfebca8e78a.tar.gz scala-bf0db36d8bbb0ac7faa0652b98458cfebca8e78a.tar.bz2 scala-bf0db36d8bbb0ac7faa0652b98458cfebca8e78a.zip | |
Merge pull request #2428 from hubertp/issue/7291
SI-7291: Don't throw exceptions while encountering diverging expansion.
Diffstat (limited to 'src/interactive')
| -rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Global.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala index 43b8bd2738..792ca6efa6 100644 --- a/src/interactive/scala/tools/nsc/interactive/Global.scala +++ b/src/interactive/scala/tools/nsc/interactive/Global.scala @@ -15,7 +15,7 @@ import scala.reflect.internal.util.{ SourceFile, BatchSourceFile, Position, NoPo import scala.tools.nsc.reporters._ import scala.tools.nsc.symtab._ import scala.tools.nsc.doc.ScaladocAnalyzer -import scala.tools.nsc.typechecker.{ Analyzer, DivergentImplicit } +import scala.tools.nsc.typechecker.Analyzer import symtab.Flags.{ACCESSOR, PARAMACCESSOR} import scala.annotation.{ elidable, tailrec } import scala.language.implicitConversions @@ -1210,9 +1210,6 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") case ex: TypeError => debugLog("type error caught: "+ex) alt - case ex: DivergentImplicit => - debugLog("divergent implicit caught: "+ex) - alt } } |