summaryrefslogtreecommitdiff
path: root/test/scaladoc/scalacheck/CommentFactoryTest.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2012-04-13 16:27:46 -0700
committerMartin Odersky <odersky@gmail.com>2012-04-13 16:27:46 -0700
commit2744be417e1f2c461068bb2daef9fa8f11822031 (patch)
tree06580aa466401d86d63176b2af429e9daaf047f9 /test/scaladoc/scalacheck/CommentFactoryTest.scala
parentb5757577c520e6339e4278fa91f725e66561f73e (diff)
parent1d0610840bb7409f0da084d3cc94e4110dd2e2c4 (diff)
downloadscala-2744be417e1f2c461068bb2daef9fa8f11822031.tar.gz
scala-2744be417e1f2c461068bb2daef9fa8f11822031.tar.bz2
scala-2744be417e1f2c461068bb2daef9fa8f11822031.zip
Merge branch 'master' into topic/sip18
Diffstat (limited to 'test/scaladoc/scalacheck/CommentFactoryTest.scala')
-rw-r--r--test/scaladoc/scalacheck/CommentFactoryTest.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/scaladoc/scalacheck/CommentFactoryTest.scala b/test/scaladoc/scalacheck/CommentFactoryTest.scala
index 69c314a64c..68ca68efdd 100644
--- a/test/scaladoc/scalacheck/CommentFactoryTest.scala
+++ b/test/scaladoc/scalacheck/CommentFactoryTest.scala
@@ -3,11 +3,12 @@ import org.scalacheck.Prop._
import scala.tools.nsc.Global
import scala.tools.nsc.doc
+import scala.tools.nsc.doc.model._
import scala.tools.nsc.doc.model.comment._
class Factory(val g: Global, val s: doc.Settings)
extends doc.model.ModelFactory(g, s) {
- thisFactory: Factory with CommentFactory with doc.model.TreeFactory =>
+ thisFactory: Factory with ModelFactoryImplicitSupport with CommentFactory with doc.model.TreeFactory =>
def strip(c: Comment): Option[Inline] = {
c.body match {
@@ -28,7 +29,7 @@ object Test extends Properties("CommentFactory") {
val settings = new doc.Settings((str: String) => {})
val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings)
val g = new Global(settings, reporter)
- (new Factory(g, settings) with CommentFactory with doc.model.TreeFactory)
+ (new Factory(g, settings) with ModelFactoryImplicitSupport with CommentFactory with doc.model.TreeFactory)
}
def parse(src: String, dst: Inline) = {