diff options
| author | Heather Miller <heather.miller@epfl.ch> | 2012-04-15 14:51:18 +0200 |
|---|---|---|
| committer | Heather Miller <heather.miller@epfl.ch> | 2012-04-15 14:51:18 +0200 |
| commit | e4bea920b42eaa526a9e07ad001f17443d6abeba (patch) | |
| tree | c786202cc9d0fa5b1a26dfd8e1154cacca7fbaf4 /test/scaladoc/scalacheck/CommentFactoryTest.scala | |
| parent | 23aa1a8d7b08b767f90657baf9bc13a355682671 (diff) | |
| parent | 364dd41c3e0e33afe6c3ec6e0c04f1d345c4b6ca (diff) | |
| download | scala-e4bea920b42eaa526a9e07ad001f17443d6abeba.tar.gz scala-e4bea920b42eaa526a9e07ad001f17443d6abeba.tar.bz2 scala-e4bea920b42eaa526a9e07ad001f17443d6abeba.zip | |
Merge branch 'master' of https://github.com/scala/scala into wip-sip14-fixes
Diffstat (limited to 'test/scaladoc/scalacheck/CommentFactoryTest.scala')
| -rw-r--r-- | test/scaladoc/scalacheck/CommentFactoryTest.scala | 5 |
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) = { |