diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-22 17:57:05 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-22 17:57:05 -0800 |
| commit | 1296bb8bffc5f0c193ad3c77333567e8853a9ee6 (patch) | |
| tree | ead39686bc995cf0c673b144afea5dd810f58f78 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | 2f7396d97f99f4ed2817566f36416e16b10b7ffc (diff) | |
| parent | ee6fbae3d069d8fe55b7a20756c04abcc9119bba (diff) | |
| download | scala-1296bb8bffc5f0c193ad3c77333567e8853a9ee6.tar.gz scala-1296bb8bffc5f0c193ad3c77333567e8853a9ee6.tar.bz2 scala-1296bb8bffc5f0c193ad3c77333567e8853a9ee6.zip | |
Merge pull request #3137 from xeno-by/topic/implicit-macros-invalidate-on-error
correctly fails implicit search for invalid implicit macros
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 025c262c8d..fdec1edcc0 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -659,6 +659,8 @@ trait Implicits { if (context.hasErrors) fail("hasMatchingSymbol reported error: " + context.firstError.get.errMsg) + else if (itree3.isErroneous) + fail("error typechecking implicit candidate") else if (isLocal && !hasMatchingSymbol(itree2)) fail("candidate implicit %s is shadowed by %s".format( info.sym.fullLocationString, itree2.symbol.fullLocationString)) |