diff options
author | Paul Phillips <paulp@improving.org> | 2013-04-24 12:51:13 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-04-24 12:51:13 -0700 |
commit | 62b6bdc088db2e3607814dfd2f83714bec97b935 (patch) | |
tree | 0376965e18d6cd5d61cd14544323897dc1390e23 /src/scaladoc | |
parent | cdffcf8962c9fa606c027fcb5a50a4273976a576 (diff) | |
parent | 10845adebe741fc2bb5bce70df0a8da7788aa722 (diff) | |
download | scala-62b6bdc088db2e3607814dfd2f83714bec97b935.tar.gz scala-62b6bdc088db2e3607814dfd2f83714bec97b935.tar.bz2 scala-62b6bdc088db2e3607814dfd2f83714bec97b935.zip |
Merge branch 'master' into pr/warning-cleanup
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Contexts.scala
Diffstat (limited to 'src/scaladoc')
-rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala index 1f87f935f2..6cefe34887 100644 --- a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala +++ b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala @@ -226,12 +226,9 @@ trait ModelFactoryImplicitSupport { // look for type variables in the type. If there are none, we can decide if the implicit is there or not if (implType.isTrivial) { try { - context.flushBuffer() /* any errors here should not prevent future findings */ - // TODO: Not sure this is the right thing to do -- seems similar to what scalac should be doing - val context2 = context.make(context.unit, context.tree, sym.owner, context.scope, context.imports) - val search = inferImplicit(EmptyTree, tpe, false, false, context2, false) - context.flushBuffer() /* any errors here should not prevent future findings */ - + // 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) available = Some(search.tree != EmptyTree) } catch { case _: TypeError => |