From ed9469c06d5b23cd6bdaba7c586763fd99b128f9 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Tue, 1 Feb 2011 08:51:30 +0000 Subject: Reverts r24155, which light testing says is the... Reverts r24155, which light testing says is the culprit for recent failures. Review by odersky. --- src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 4 ++-- 1 file 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 } -- cgit v1.2.3