summaryrefslogtreecommitdiff
path: root/src/scaladoc/scala/tools/nsc
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-03-31 16:06:56 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-03-31 16:06:56 -0700
commit5654ebddb63d078f9f79dcf84fbb8489030136f6 (patch)
treed4bfc365cdf8e4993113275136f14803ceab3abd /src/scaladoc/scala/tools/nsc
parent4fc7d5517c7152d43745960efde5042febe29422 (diff)
parent5e5ab186fe5b8cf047fd3da58da29dbc8f9fbd71 (diff)
downloadscala-5654ebddb63d078f9f79dcf84fbb8489030136f6.tar.gz
scala-5654ebddb63d078f9f79dcf84fbb8489030136f6.tar.bz2
scala-5654ebddb63d078f9f79dcf84fbb8489030136f6.zip
Merge pull request #4971 from adriaanm/genbcode-delambdafy
Unify treatment of built-in functions and SAMs
Diffstat (limited to 'src/scaladoc/scala/tools/nsc')
-rw-r--r--src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
index 830d902b68..e67a717257 100644
--- a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
@@ -236,7 +236,7 @@ trait ModelFactoryImplicitSupport {
try {
// TODO: Not sure if `owner = sym.owner` is the right thing to do -- seems similar to what scalac should be doing
val silentContext = context.make(owner = sym.owner).makeSilent(reportAmbiguousErrors = false)
- val search = inferImplicit(EmptyTree, tpe, false, false, silentContext, false)
+ val search = inferImplicitByTypeSilent(tpe, silentContext)
available = Some(search.tree != EmptyTree)
} catch {
case _: TypeError =>