From aced32d05c97651534f468bc9a475ea5f6ae75b8 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Fri, 27 Sep 2013 12:28:55 -0700 Subject: Removing unused code. Most of this was revealed via -Xlint with a flag which assumes closed world. I can't see how to check the assumes-closed-world code in without it being an ordeal. I'll leave it in a branch in case anyone wants to finish the long slog to the merge. --- src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala | 1 - src/scaladoc/scala/tools/nsc/doc/model/CommentFactory.scala | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/scaladoc') diff --git a/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala b/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala index e654678c6d..2ea3a0eb7c 100644 --- a/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala +++ b/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala @@ -7,7 +7,6 @@ package scala.tools.nsc package doc import scala.tools.nsc.ast.parser.{ SyntaxAnalyzer, BracePatch } -import symtab._ import reporters.Reporter import typechecker.Analyzer import scala.reflect.internal.util.{ BatchSourceFile, RangePosition } diff --git a/src/scaladoc/scala/tools/nsc/doc/model/CommentFactory.scala b/src/scaladoc/scala/tools/nsc/doc/model/CommentFactory.scala index 4e06e5bd16..fe157c1cc9 100644 --- a/src/scaladoc/scala/tools/nsc/doc/model/CommentFactory.scala +++ b/src/scaladoc/scala/tools/nsc/doc/model/CommentFactory.scala @@ -9,10 +9,8 @@ package model import base.comment._ -import reporters.Reporter import scala.collection._ -import scala.reflect.internal.util.{NoPosition, Position} -import scala.language.postfixOps +import scala.reflect.internal.util.Position /** The comment parser transforms raw comment strings into `Comment` objects. * Call `parse` to run the parser. Note that the parser is stateless and @@ -24,7 +22,7 @@ trait CommentFactory extends base.CommentFactoryBase { thisFactory: ModelFactory with CommentFactory with MemberLookup => val global: Global - import global.{ reporter, definitions, Symbol, NoSymbol } + import global.{ Symbol, NoSymbol } protected val commentCache = mutable.HashMap.empty[(Symbol, DocTemplateImpl), Option[Comment]] @@ -83,7 +81,7 @@ trait CommentFactory extends base.CommentFactoryBase { } protected def parse(comment: String, src: String, pos: Position, linkTarget: DocTemplateImpl): Comment = { - val sym = if (linkTarget eq null) NoSymbol else linkTarget.sym + val sym = if (linkTarget eq null) NoSymbol else linkTarget.sym parseAtSymbol(comment, src, pos, sym) } @@ -94,7 +92,7 @@ trait CommentFactory extends base.CommentFactoryBase { * - Removed all end-of-line whitespace. * - Only `endOfLine` is used to mark line endings. */ def parseWiki(string: String, pos: Position, inTpl: DocTemplateImpl): Body = { - val sym = if (inTpl eq null) NoSymbol else inTpl.sym + val sym = if (inTpl eq null) NoSymbol else inTpl.sym parseWikiAtSymbol(string,pos, sym) } } -- cgit v1.2.3