diff options
author | Paul Phillips <paulp@improving.org> | 2013-03-11 22:11:20 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-03-12 07:35:49 -0700 |
commit | fc5e5581ec2eb91d22cbc8a2f19729c7c9a87254 (patch) | |
tree | a3d9b6faf5b007ff4a8e17f6ac066e1c8959c6e3 /src/scaladoc | |
parent | 9fed30cb9c6d86ca07286febeb44bf635cb23650 (diff) | |
download | scala-fc5e5581ec2eb91d22cbc8a2f19729c7c9a87254.tar.gz scala-fc5e5581ec2eb91d22cbc8a2f19729c7c9a87254.tar.bz2 scala-fc5e5581ec2eb91d22cbc8a2f19729c7c9a87254.zip |
Eliminate a bunch of -Xlint warnings.
Mostly unused private code, unused imports, and points where
an extra pair of parentheses is necessary for scalac to have
confidence in our intentions.
Diffstat (limited to 'src/scaladoc')
5 files changed, 2 insertions, 6 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala b/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala index 2064d86860..ef0a013ff2 100755 --- a/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala +++ b/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala @@ -679,7 +679,6 @@ trait CommentFactoryBase { this: MemberLookupBase => val SchemeUri = """([a-z]+:.*)""".r jump("[[") val parens = 2 + repeatJump('[') - val start = "[" * parens val stop = "]" * parens //println("link with " + parens + " matching parens") val target = readUntil { check(stop) || check(" ") } diff --git a/src/scaladoc/scala/tools/nsc/doc/base/LinkTo.scala b/src/scaladoc/scala/tools/nsc/doc/base/LinkTo.scala index c11179800c..3d80f9da52 100755 --- a/src/scaladoc/scala/tools/nsc/doc/base/LinkTo.scala +++ b/src/scaladoc/scala/tools/nsc/doc/base/LinkTo.scala @@ -6,8 +6,6 @@ package scala.tools.nsc package doc package base -import scala.collection._ - sealed trait LinkTo final case class LinkToMember[Mbr, Tpl](mbr: Mbr, tpl: Tpl) extends LinkTo final case class LinkToTpl[Tpl](tpl: Tpl) extends LinkTo diff --git a/src/scaladoc/scala/tools/nsc/doc/base/MemberLookupBase.scala b/src/scaladoc/scala/tools/nsc/doc/base/MemberLookupBase.scala index 8d80333195..671518fbc6 100755 --- a/src/scaladoc/scala/tools/nsc/doc/base/MemberLookupBase.scala +++ b/src/scaladoc/scala/tools/nsc/doc/base/MemberLookupBase.scala @@ -46,7 +46,7 @@ trait MemberLookupBase { } else "" def memberLookup(pos: Position, query: String, siteOpt: Option[Symbol]): LinkTo = { - var members = breakMembers(query) + val members = breakMembers(query) // (1) First look in the root package, as most of the links are qualified val fromRoot = lookupInRootPackage(pos, members) diff --git a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala index 1df725636a..895cc84f39 100644 --- a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala +++ b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala @@ -4,7 +4,6 @@ package scala.tools.nsc package doc package model -import base._ import base.comment._ import diagram._ diff --git a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala index 868c2fc3a4..71b0a00e0a 100644 --- a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala +++ b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala @@ -314,7 +314,7 @@ trait ModelFactoryImplicitSupport { }) case other => // this is likely an error on the lub/glb side - error("Scaladoc implicits: Error computing lub/glb for: " + (tparam, constr) + ":\n" + other) + error("Scaladoc implicits: Error computing lub/glb for: " + ((tparam, constr)) + ":\n" + other) Nil } } |