Merge pull request #2130 from vigdorchik/relax_doc

SI-7134: don't require doc.Settings in base api of scaladoc.

2 files changed, 7 insertions, 9 deletions

diff --git a/test/files/presentation/doc/doc.scala b/test/files/presentation/doc/doc.scala
index 475d92b861..5855f488b8 100755
--- a/test/files/presentation/doc/doc.scala
+++ b/test/files/presentation/doc/doc.scala
@@ -7,8 +7,6 @@ import scala.tools.nsc.util._
 import scala.tools.nsc.io._
 
 object Test extends InteractiveTest {
-  override val settings: doc.Settings = docSettings
-
   val tags = Seq(
     "@example  `\"abb\".permutations = Iterator(abb, bab, bba)`",
     "@version 1.0, 09/07/2012",
@@ -29,16 +27,16 @@ object Test extends InteractiveTest {
        |class User(c: %sCommented)""".stripMargin.format(comment, tags take nTags mkString "\n", caret)
 
   override lazy val compiler = {
-    new {
-      override val settings = {
-        prepareSettings(Test.this.settings)
-        Test.this.settings
-      }
-    } with Global(settings, compilerReporter) with MemberLookupBase with CommentFactoryBase {
+    prepareSettings(settings)
+    new Global(settings, compilerReporter) with MemberLookupBase with CommentFactoryBase {
       val global: this.type = this
       def chooseLink(links: List[LinkTo]): LinkTo = links.head
       def internalLink(sym: Symbol, site: Symbol) = None
       def toString(link: LinkTo) = link.toString
+      def warnNoLink = false
+      def findExternalLink(sym: Symbol, name: String) = None
+
+      override def forScaladoc = true
 
       def getComment(sym: Symbol, source: SourceFile) = {
         val docResponse = new Response[(String, String, Position)]
diff --git a/test/files/presentation/memory-leaks/MemoryLeaksTest.scala b/test/files/presentation/memory-leaks/MemoryLeaksTest.scala
index 159097cc10..950569c880 100644
--- a/test/files/presentation/memory-leaks/MemoryLeaksTest.scala
+++ b/test/files/presentation/memory-leaks/MemoryLeaksTest.scala
@@ -25,7 +25,7 @@ import scala.tools.nsc.doc
 object Test extends InteractiveTest {
   final val mega = 1024 * 1024
 
-  override val settings: doc.Settings = docSettings
+  override val withDocComments = true
 
   override def execute(): Unit = memoryConsumptionTest()