diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-04 19:45:08 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-04 19:45:08 -0800 |
commit | 75ca8693f3c8468ab35e8a4cb53d4d4981d7363c (patch) | |
tree | 2d84cedaaed9762e0310d18e6a1f01b15667c7a3 /src/compiler | |
parent | 893fad496965744f6e6fbfa4b5a0add3c5eff9fa (diff) | |
parent | b67f8e57f4381024c0fba109ebe11d4006472d83 (diff) | |
download | scala-75ca8693f3c8468ab35e8a4cb53d4d4981d7363c.tar.gz scala-75ca8693f3c8468ab35e8a4cb53d4d4981d7363c.tar.bz2 scala-75ca8693f3c8468ab35e8a4cb53d4d4981d7363c.zip |
Merge pull request #2063 from retronym/ticket/6667-2.10.x-revert
[nomerge] SI-6667 Demote a new ambiguity error to a lint warning.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index ec3a0a0ef7..d1cf9b1904 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -1319,12 +1319,17 @@ trait Implicits { // `materializeImplicit` does some preprocessing for `pt` // is it only meant for manifests/tags or we need to do the same for `implicitsOfExpectedType`? - if (result.isFailure && !wasAmbigious) result = searchImplicit(implicitsOfExpectedType, false) + if (result.isFailure) result = searchImplicit(implicitsOfExpectedType, false) if (result.isFailure) { context.updateBuffer(previousErrs) if (Statistics.canEnable) Statistics.stopTimer(oftypeFailNanos, failstart) } else { + if (wasAmbigious && settings.lint.value) + reporter.warning(tree.pos, + "Search of in-scope implicits was ambiguous, and the implicit scope was searched. In Scala 2.11.0, this code will not compile. See SI-6667. \n" + + previousErrs.map(_.errMsg).mkString("\n")) + if (Statistics.canEnable) Statistics.stopTimer(oftypeSucceedNanos, succstart) if (Statistics.canEnable) Statistics.incCounter(oftypeImplicitHits) } |