summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-05-17 02:07:42 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-05-17 02:07:42 -0700
commitbe405eed9bef9736f0142d6ddf53b6bf8af08696 (patch)
treee0815a75eb05bb0ddb3b078f0dc2d91a83c756dd /test
parent9d5e143d29c0f43a97c62aee537de1c889e6c15f (diff)
parentadd19e6839c8238d4ce173006287b399b7958f22 (diff)
downloadscala-be405eed9bef9736f0142d6ddf53b6bf8af08696.tar.gz
scala-be405eed9bef9736f0142d6ddf53b6bf8af08696.tar.bz2
scala-be405eed9bef9736f0142d6ddf53b6bf8af08696.zip
Merge pull request #2454 from vigdorchik/scaladoc_fixes
This is a cleanup of scaladoc code.
Diffstat (limited to 'test')
-rwxr-xr-xtest/files/presentation/doc/doc.scala2
-rw-r--r--test/scaladoc/scalacheck/CommentFactoryTest.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/presentation/doc/doc.scala b/test/files/presentation/doc/doc.scala
index 916b7832f4..a64a423cc5 100755
--- a/test/files/presentation/doc/doc.scala
+++ b/test/files/presentation/doc/doc.scala
@@ -71,7 +71,7 @@ object Test extends InteractiveTest {
if (expanded.isEmpty)
None
else
- Some(ask { () => parseAtSymbol(expanded, raw, pos, Some(sym.owner)) })
+ Some(ask { () => parseAtSymbol(expanded, raw, pos, sym.owner) })
}
}
}
diff --git a/test/scaladoc/scalacheck/CommentFactoryTest.scala b/test/scaladoc/scalacheck/CommentFactoryTest.scala
index 28043e5a06..ff64a25602 100644
--- a/test/scaladoc/scalacheck/CommentFactoryTest.scala
+++ b/test/scaladoc/scalacheck/CommentFactoryTest.scala
@@ -25,10 +25,10 @@ class Factory(val g: Global, val s: doc.Settings)
}
def parseComment(s: String): Option[Inline] =
- strip(parse(s, "", scala.tools.nsc.util.NoPosition))
+ strip(parse(s, "", scala.tools.nsc.util.NoPosition, null))
def createBody(s: String) =
- parse(s, "", scala.tools.nsc.util.NoPosition).body
+ parse(s, "", scala.tools.nsc.util.NoPosition, null).body
}
object Test extends Properties("CommentFactory") {