diff options
| author | Paul Phillips <paulp@improving.org> | 2011-02-01 08:51:30 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-02-01 08:51:30 +0000 |
| commit | ed9469c06d5b23cd6bdaba7c586763fd99b128f9 (patch) | |
| tree | 9f24fff20813a3db24a9f1b4d65187c174aa1d2e | |
| parent | ee4e09235afa578a7a33267061179ca338e396c0 (diff) | |
| download | scala-ed9469c06d5b23cd6bdaba7c586763fd99b128f9.tar.gz scala-ed9469c06d5b23cd6bdaba7c586763fd99b128f9.tar.bz2 scala-ed9469c06d5b23cd6bdaba7c586763fd99b128f9.zip | |
Reverts r24155, which light testing says is the...
Reverts r24155, which light testing says is the culprit for recent
failures. Review by odersky.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index a93eb0d5b4..bac6af71e9 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -997,6 +997,6 @@ trait Implicits { } } - private class DivergentImplicit extends TypeError("Divergent implicit search") - private val DivergentImplicit = new DivergentImplicit + private class DivergentImplicit extends Exception() + private def DivergentImplicit = new DivergentImplicit } |