diff options
author | Simon Ochsenreither <simon@ochsenreither.de> | 2015-10-25 23:20:04 +0100 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-12-18 10:31:49 +0100 |
commit | 92affd3e76d1a3019f1c35ac20af32360d914641 (patch) | |
tree | 296270bf7271c1085a94d71e2d4bfa5789b3bfca /src/repl | |
parent | 1873db3fb78ba777c009bce11564466de875257a (diff) | |
download | scala-92affd3e76d1a3019f1c35ac20af32360d914641.tar.gz scala-92affd3e76d1a3019f1c35ac20af32360d914641.tar.bz2 scala-92affd3e76d1a3019f1c35ac20af32360d914641.zip |
Remove unused imports and other minor cleanups
- Language imports are preceding other imports
- Deleted empty file: InlineErasure
- Removed some unused private[parallel] methods in
scala/collection/parallel/package.scala
This removes hundreds of warnings when compiling with
"-Xlint -Ywarn-dead-code -Ywarn-unused -Ywarn-unused-import".
Diffstat (limited to 'src/repl')
14 files changed, 29 insertions, 43 deletions
diff --git a/src/repl/scala/tools/nsc/MainGenericRunner.scala b/src/repl/scala/tools/nsc/MainGenericRunner.scala index 34057ed341..747b684293 100644 --- a/src/repl/scala/tools/nsc/MainGenericRunner.scala +++ b/src/repl/scala/tools/nsc/MainGenericRunner.scala @@ -6,8 +6,8 @@ package scala package tools.nsc -import io.{ File } -import util.{ ClassPath, ScalaClassLoader } +import io.File +import util.ClassPath import GenericRunnerCommand._ object JarRunner extends CommonRunner { diff --git a/src/repl/scala/tools/nsc/interpreter/ExprTyper.scala b/src/repl/scala/tools/nsc/interpreter/ExprTyper.scala index 8a6a405810..01e3a90950 100644 --- a/src/repl/scala/tools/nsc/interpreter/ExprTyper.scala +++ b/src/repl/scala/tools/nsc/interpreter/ExprTyper.scala @@ -6,8 +6,6 @@ package scala.tools.nsc package interpreter -import scala.tools.nsc.ast.parser.Tokens.EOF - trait ExprTyper { val repl: IMain diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala index 57ba15e33b..459450a94e 100644 --- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala @@ -12,18 +12,17 @@ import Predef.{ println => _, _ } import interpreter.session._ import StdReplTags._ import scala.tools.asm.ClassReader -import scala.util.Properties.{ jdkHome, javaVersion, versionString, javaVmName } -import scala.tools.nsc.util.{ ClassPath, Exceptional, stringFromWriter, stringFromStream } +import scala.util.Properties.jdkHome +import scala.tools.nsc.util.{ ClassPath, stringFromStream } import scala.reflect.classTag import scala.reflect.internal.util.{ BatchSourceFile, ScalaClassLoader } import ScalaClassLoader._ -import scala.reflect.io.{ File, Directory } +import scala.reflect.io.File import scala.tools.util._ import io.AbstractFile -import scala.collection.generic.Clearable -import scala.concurrent.{ ExecutionContext, Await, Future, future } +import scala.concurrent.{ ExecutionContext, Await, Future } import ExecutionContext.Implicits._ -import java.io.{ BufferedReader, FileReader, StringReader } +import java.io.BufferedReader import scala.util.{ Try, Success, Failure } @@ -543,7 +542,6 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) case i => val n = s.take(i).toInt ; (n, s.drop(i+1).toInt - n) } } - import scala.collection.JavaConverters._ val index = (start - 1) max 0 val text = history.asStrings(index, index + len) mkString "\n" edit(text) @@ -906,7 +904,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) // sets in to some kind of reader depending on environmental cues in = in0.fold(chooseReader(settings))(r => SimpleReader(r, out, interactive = true)) - globalFuture = future { + globalFuture = Future { intp.initializeSynchronous() loopPostInit() !intp.reporter.hasErrors diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala index ef6ab4063a..893bde42ab 100644 --- a/src/repl/scala/tools/nsc/interpreter/IMain.scala +++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala @@ -15,19 +15,14 @@ import scala.concurrent.{ Future, ExecutionContext } import scala.reflect.runtime.{ universe => ru } import scala.reflect.{ ClassTag, classTag } import scala.reflect.internal.util.{ BatchSourceFile, SourceFile } -import scala.tools.nsc.interactive -import scala.tools.nsc.reporters.StoreReporter -import scala.tools.nsc.util.ClassPath.DefaultJavaContext import scala.tools.util.PathResolverFactory import scala.tools.nsc.io.AbstractFile import scala.tools.nsc.typechecker.{ TypeStrings, StructuredTypeStrings } import scala.tools.nsc.util._ import ScalaClassLoader.URLClassLoader import scala.tools.nsc.util.Exceptional.unwrap -import scala.tools.nsc.backend.JavaPlatform import javax.script.{AbstractScriptEngine, Bindings, ScriptContext, ScriptEngine, ScriptEngineFactory, ScriptException, CompiledScript, Compilable} import java.net.URL -import java.io.File /** An interpreter for Scala code. * diff --git a/src/repl/scala/tools/nsc/interpreter/Imports.scala b/src/repl/scala/tools/nsc/interpreter/Imports.scala index 5742c1d0d8..6a75432ac6 100644 --- a/src/repl/scala/tools/nsc/interpreter/Imports.scala +++ b/src/repl/scala/tools/nsc/interpreter/Imports.scala @@ -6,13 +6,13 @@ package scala.tools.nsc package interpreter -import scala.collection.{ mutable, immutable } +import scala.collection.mutable trait Imports { self: IMain => import global._ - import definitions.{ ObjectClass, ScalaPackage, JavaLangPackage, PredefModule } + import definitions.{ ScalaPackage, JavaLangPackage, PredefModule } import memberHandlers._ /** Synthetic import handlers for the language defined imports. */ diff --git a/src/repl/scala/tools/nsc/interpreter/JavapClass.scala b/src/repl/scala/tools/nsc/interpreter/JavapClass.scala index 04f4512717..034437fe5c 100644 --- a/src/repl/scala/tools/nsc/interpreter/JavapClass.scala +++ b/src/repl/scala/tools/nsc/interpreter/JavapClass.scala @@ -6,23 +6,23 @@ package scala package tools.nsc package interpreter +import scala.language.reflectiveCalls + import java.lang.{ Iterable => JIterable } -import scala.tools.nsc.util.ScalaClassLoader +import scala.reflect.internal.util.ScalaClassLoader import java.io.{ ByteArrayInputStream, CharArrayWriter, FileNotFoundException, PrintWriter, StringWriter, Writer } import java.util.{ Locale } import java.util.concurrent.ConcurrentLinkedQueue -import javax.tools.{ Diagnostic, DiagnosticCollector, DiagnosticListener, +import javax.tools.{ Diagnostic, DiagnosticListener, ForwardingJavaFileManager, JavaFileManager, JavaFileObject, SimpleJavaFileObject, StandardLocation } -import scala.reflect.io.{ AbstractFile, Directory, File, Path } +import scala.reflect.io.File import scala.io.Source import scala.util.{ Try, Success, Failure } import scala.util.Properties.{ lineSeparator => EOL } -import scala.util.matching.Regex import scala.collection.JavaConverters._ import scala.collection.generic.Clearable import java.net.URL -import scala.language.reflectiveCalls import Javap.{ JpResult, JpError, Showable, helper, toolArgs, DefaultOptions } /** Javap command implementation. @@ -214,7 +214,6 @@ class JavapClass( ) orFailed null class JavaReporter extends DiagnosticListener[JavaFileObject] with Clearable { - import scala.collection.mutable.{ ArrayBuffer, SynchronizedBuffer } type D = Diagnostic[_ <: JavaFileObject] val diagnostics = new ConcurrentLinkedQueue[D] override def report(d: Diagnostic[_ <: JavaFileObject]) { @@ -342,8 +341,6 @@ class JavapClass( } object JavapClass { - import scala.tools.asm.ClassReader - import scala.tools.asm.tree.{ ClassNode, MethodNode } def apply( loader: ScalaClassLoader = ScalaClassLoader.appLoader, diff --git a/src/repl/scala/tools/nsc/interpreter/LoopCommands.scala b/src/repl/scala/tools/nsc/interpreter/LoopCommands.scala index 9f555aee14..8c3b174513 100644 --- a/src/repl/scala/tools/nsc/interpreter/LoopCommands.scala +++ b/src/repl/scala/tools/nsc/interpreter/LoopCommands.scala @@ -8,10 +8,10 @@ package tools package nsc package interpreter -import scala.collection.{ mutable, immutable } -import mutable.ListBuffer import scala.language.implicitConversions +import scala.collection.mutable.ListBuffer + class ProcessResult(val line: String) { import scala.sys.process._ private val buffer = new ListBuffer[String] diff --git a/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala b/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala index 4e45f6d615..d6c0dafaf2 100644 --- a/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala +++ b/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala @@ -6,9 +6,10 @@ package scala.tools.nsc package interpreter -import scala.collection.{ mutable, immutable } import scala.language.implicitConversions +import scala.collection.mutable + trait MemberHandlers { val intp: IMain diff --git a/src/repl/scala/tools/nsc/interpreter/NamedParam.scala b/src/repl/scala/tools/nsc/interpreter/NamedParam.scala index a0af72940a..d59b07a452 100644 --- a/src/repl/scala/tools/nsc/interpreter/NamedParam.scala +++ b/src/repl/scala/tools/nsc/interpreter/NamedParam.scala @@ -6,10 +6,11 @@ package scala.tools.nsc package interpreter -import NamedParam._ import scala.language.implicitConversions + +import NamedParam._ import scala.reflect.runtime.{universe => ru} -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{ClassTag} import scala.tools.nsc.typechecker.{ TypeStrings } trait NamedParamCreator { diff --git a/src/repl/scala/tools/nsc/interpreter/Phased.scala b/src/repl/scala/tools/nsc/interpreter/Phased.scala index 3dda323762..d1d422ce3e 100644 --- a/src/repl/scala/tools/nsc/interpreter/Phased.scala +++ b/src/repl/scala/tools/nsc/interpreter/Phased.scala @@ -6,7 +6,6 @@ package scala.tools.nsc package interpreter -import scala.collection.immutable import scala.language.implicitConversions /** Mix this into an object and use it as a phasing diff --git a/src/repl/scala/tools/nsc/interpreter/Power.scala b/src/repl/scala/tools/nsc/interpreter/Power.scala index a14a60d216..3c08a03c94 100644 --- a/src/repl/scala/tools/nsc/interpreter/Power.scala +++ b/src/repl/scala/tools/nsc/interpreter/Power.scala @@ -6,14 +6,13 @@ package scala.tools.nsc package interpreter -import scala.collection.{ mutable, immutable } -import scala.util.matching.Regex -import scala.io.Codec -import java.net.{ URL, MalformedURLException } -import io.{ Path } import scala.language.implicitConversions + +import scala.collection.mutable +import scala.io.Codec +import java.net.URL import scala.reflect.runtime.{universe => ru} -import scala.reflect.{ClassTag, classTag} +import scala.reflect.ClassTag /** Collecting some power mode examples. @@ -43,7 +42,7 @@ Lost after 18/flatten { /** A class for methods to be injected into the intp in power mode. */ class Power[ReplValsImpl <: ReplVals : ru.TypeTag: ClassTag](val intp: IMain, replVals: ReplValsImpl) { - import intp.{ beQuietDuring, typeOfExpression, interpret, parse } + import intp.{ beQuietDuring, parse } import intp.global._ import definitions.{ compilerTypeFromTag, compilerSymbolFromTag} diff --git a/src/repl/scala/tools/nsc/interpreter/PresentationCompilerCompleter.scala b/src/repl/scala/tools/nsc/interpreter/PresentationCompilerCompleter.scala index 62e12f8703..a912ec9749 100644 --- a/src/repl/scala/tools/nsc/interpreter/PresentationCompilerCompleter.scala +++ b/src/repl/scala/tools/nsc/interpreter/PresentationCompilerCompleter.scala @@ -4,7 +4,6 @@ */ package scala.tools.nsc.interpreter -import scala.reflect.internal.Flags import scala.reflect.internal.util.StringOps import scala.tools.nsc.interpreter.Completion.Candidates import scala.util.control.NonFatal diff --git a/src/repl/scala/tools/nsc/interpreter/RichClass.scala b/src/repl/scala/tools/nsc/interpreter/RichClass.scala index 36cdf65510..df900d1436 100644 --- a/src/repl/scala/tools/nsc/interpreter/RichClass.scala +++ b/src/repl/scala/tools/nsc/interpreter/RichClass.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interpreter -import scala.reflect.{ ClassTag, classTag } +import scala.reflect.ClassTag class RichClass[T](val clazz: Class[T]) { def toTag: ClassTag[T] = ClassTag[T](clazz) diff --git a/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala b/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala index 504d0d30ee..92bf9d1df4 100644 --- a/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala +++ b/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala @@ -8,7 +8,6 @@ package interpreter package session import scala.collection.mutable.{ Buffer, ListBuffer } -import scala.collection.JavaConverters._ class SimpleHistory extends History { private var _index: Int = 0 |