From 27fe8eb6f7e032c58148b017e8ba264c9bcbe07b Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Tue, 30 Aug 2016 15:29:17 +0900 Subject: [PATCH] remove unused imports (#2719) --- main-actions/src/test/scala/sbt/compiler/EvalTest.scala | 2 +- main-settings/src/main/scala/sbt/std/InputConvert.scala | 1 - main-settings/src/test/scala/UsageTest.scala | 2 +- main/src/main/scala/sbt/Defaults.scala | 4 ---- main/src/main/scala/sbt/Keys.scala | 4 +--- main/src/test/scala/DefaultsTest.scala | 2 -- main/src/test/scala/Delegates.scala | 4 +--- main/src/test/scala/ParseKey.scala | 1 - main/src/test/scala/PluginsTest.scala | 1 - main/src/test/scala/sbt/internal/TestBuild.scala | 7 ++----- tasks-standard/src/test/scala/TaskRunnerCircular.scala | 1 - tasks-standard/src/test/scala/TaskRunnerFork.scala | 1 - tasks-standard/src/test/scala/Test.scala | 3 --- tasks-standard/src/test/scala/TestRunnerCall.scala | 3 +-- tasks-standard/src/test/scala/TestRunnerSort.scala | 2 -- 15 files changed, 7 insertions(+), 31 deletions(-) diff --git a/main-actions/src/test/scala/sbt/compiler/EvalTest.scala b/main-actions/src/test/scala/sbt/compiler/EvalTest.scala index 415648f62..dfdd839cf 100644 --- a/main-actions/src/test/scala/sbt/compiler/EvalTest.scala +++ b/main-actions/src/test/scala/sbt/compiler/EvalTest.scala @@ -10,7 +10,7 @@ import sbt.io.IO object EvalTest extends Properties("eval") { private[this] val reporter = new StoreReporter - import reporter.{ ERROR, Info, Severity } + import reporter.{ ERROR, Info } private[this] val eval = new Eval(_ => reporter, None) property("inferred integer") = forAll { (i: Int) => diff --git a/main-settings/src/main/scala/sbt/std/InputConvert.scala b/main-settings/src/main/scala/sbt/std/InputConvert.scala index 25f29a095..3c993899b 100644 --- a/main-settings/src/main/scala/sbt/std/InputConvert.scala +++ b/main-settings/src/main/scala/sbt/std/InputConvert.scala @@ -1,7 +1,6 @@ package sbt package std -import language.experimental.macros import reflect.macros._ import Def.Initialize diff --git a/main-settings/src/test/scala/UsageTest.scala b/main-settings/src/test/scala/UsageTest.scala index c150dd52c..909374049 100644 --- a/main-settings/src/test/scala/UsageTest.scala +++ b/main-settings/src/test/scala/UsageTest.scala @@ -2,7 +2,7 @@ package sbt package std import sbt.internal.util.complete -import sbt.internal.util.complete.{ DefaultParsers, Parsers } +import sbt.internal.util.complete.DefaultParsers /*object UseTask { diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index b95012d18..074054e0b 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -51,13 +51,11 @@ import Keys._ import xsbt.api.Discovery import xsbti.compile.{ Compilers, - ClasspathOptions, CompileAnalysis, CompileOptions, CompileOrder, CompileResult, DefinesClass, - IncOptions, IncOptionsUtil, Inputs, MiniSetup, @@ -69,10 +67,8 @@ import xsbti.compile.{ import sbt.internal.inc.{ AnalyzingCompiler, Analysis, - ClassfileManager, CompilerCache, FileValueCache, - IncrementalCompilerImpl, Locate, LoggerReporter, MixedAnalyzingCompiler, diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala index 6d37b03b2..f8a7ea34f 100644 --- a/main/src/main/scala/sbt/Keys.scala +++ b/main/src/main/scala/sbt/Keys.scala @@ -7,9 +7,7 @@ import java.io.File import java.net.URL import scala.concurrent.duration.{ FiniteDuration, Duration } import Def.ScopedKey -import sbt.internal.util.complete._ -import sbt.internal.inc.{ MixedAnalyzingCompiler, ScalaInstance } -import std.TaskExtra._ +import sbt.internal.inc.ScalaInstance import xsbti.compile.{ DefinesClass, ClasspathOptions, diff --git a/main/src/test/scala/DefaultsTest.scala b/main/src/test/scala/DefaultsTest.scala index c09a806c0..0a1ef615c 100644 --- a/main/src/test/scala/DefaultsTest.scala +++ b/main/src/test/scala/DefaultsTest.scala @@ -1,7 +1,5 @@ package sbt -import java.io._ - import org.specs2.mutable.Specification object DefaultsTest extends Specification { diff --git a/main/src/test/scala/Delegates.scala b/main/src/test/scala/Delegates.scala index 1af21d065..b338734e7 100644 --- a/main/src/test/scala/Delegates.scala +++ b/main/src/test/scala/Delegates.scala @@ -1,11 +1,9 @@ package sbt import Project._ -import sbt.internal.util.Types.{ idFun, some } +import sbt.internal.util.Types.idFun import sbt.internal.TestBuild._ -import java.io.File -import java.net.URI import org.scalacheck._ import Prop._ import Gen._ diff --git a/main/src/test/scala/ParseKey.scala b/main/src/test/scala/ParseKey.scala index aebf90ca6..cc41901a7 100644 --- a/main/src/test/scala/ParseKey.scala +++ b/main/src/test/scala/ParseKey.scala @@ -1,7 +1,6 @@ package sbt import Def.{ displayFull, displayMasked, ScopedKey } -import java.net.URI import sbt.internal.{ TestBuild, Resolve } import TestBuild._ import sbt.internal.util.complete._ diff --git a/main/src/test/scala/PluginsTest.scala b/main/src/test/scala/PluginsTest.scala index ca0947d3c..575c85d35 100644 --- a/main/src/test/scala/PluginsTest.scala +++ b/main/src/test/scala/PluginsTest.scala @@ -1,6 +1,5 @@ package sbt -import java.io.File import org.specs2._ import mutable.Specification import sbt.util.Logger diff --git a/main/src/test/scala/sbt/internal/TestBuild.scala b/main/src/test/scala/sbt/internal/TestBuild.scala index 72fd594c6..bac5fa0ab 100644 --- a/main/src/test/scala/sbt/internal/TestBuild.scala +++ b/main/src/test/scala/sbt/internal/TestBuild.scala @@ -3,15 +3,12 @@ package internal import Def.{ ScopedKey, Setting } import sbt.internal.util.{ AttributeKey, AttributeMap, Relation, Settings } -import sbt.internal.util.Types.{ const, idFun, some } +import sbt.internal.util.Types.{ const, some } import sbt.internal.util.complete.Parser -import java.io.File import java.net.URI import org.scalacheck._ -import Prop._ import Gen._ -import Arbitrary.arbBool // Notes: // Generator doesn't produce cross-build project dependencies or do anything with the 'extra' axis @@ -59,7 +56,7 @@ object TestBuild { lazy val allAttributeKeys: Set[AttributeKey[_]] = data.data.values.flatMap(_.keys).toSet lazy val (taskAxes, globalTaskAxis, onlyTaskAxis, multiTaskAxis) = { - import collection.{ breakOut, mutable } + import collection.mutable import mutable.HashSet // task axis of Scope is set to Global and the value of the second map is the original task axis diff --git a/tasks-standard/src/test/scala/TaskRunnerCircular.scala b/tasks-standard/src/test/scala/TaskRunnerCircular.scala index ee89295b3..1499a8feb 100644 --- a/tasks-standard/src/test/scala/TaskRunnerCircular.scala +++ b/tasks-standard/src/test/scala/TaskRunnerCircular.scala @@ -3,7 +3,6 @@ package sbt import org.scalacheck._ import Prop._ import TaskGen._ -import Task._ object TaskRunnerCircularTest extends Properties("TaskRunner Circular") { property("Catches circular references") = forAll(MaxTasksGen, MaxWorkersGen) { checkCircularReferences _ } diff --git a/tasks-standard/src/test/scala/TaskRunnerFork.scala b/tasks-standard/src/test/scala/TaskRunnerFork.scala index 0f7ac344a..ad95e742b 100644 --- a/tasks-standard/src/test/scala/TaskRunnerFork.scala +++ b/tasks-standard/src/test/scala/TaskRunnerFork.scala @@ -2,7 +2,6 @@ import sbt._ import org.scalacheck._ import Prop._ -import Task._ import TaskGen._ import math.abs diff --git a/tasks-standard/src/test/scala/Test.scala b/tasks-standard/src/test/scala/Test.scala index 48e9d7c63..a4800d413 100644 --- a/tasks-standard/src/test/scala/Test.scala +++ b/tasks-standard/src/test/scala/Test.scala @@ -3,10 +3,7 @@ */ package sbt -import sbt.internal.util.Types._ import sbt.internal.util.AList -import Task._ -import Execute._ object Test extends std.TaskExtra { def t2[A, B](a: Task[A], b: Task[B]) = multInputTask[({ type l[L[x]] = (L[A], L[B]) })#l]((a, b))(AList.tuple2) diff --git a/tasks-standard/src/test/scala/TestRunnerCall.scala b/tasks-standard/src/test/scala/TestRunnerCall.scala index 31daa5c32..2ac9b574d 100644 --- a/tasks-standard/src/test/scala/TestRunnerCall.scala +++ b/tasks-standard/src/test/scala/TestRunnerCall.scala @@ -3,7 +3,6 @@ import sbt._ import org.scalacheck._ import Prop._ import TaskGen._ -import Task._ object TaskRunnerCallTest extends Properties("TaskRunner Call") { property("calculates fibonacci") = forAll(MaxTasksGen, MaxWorkersGen) { (i: Int, workers: Int) => @@ -40,4 +39,4 @@ object TaskRunnerCallTest extends Properties("TaskRunner Call") { build(index + 1, x2, x1 + x2) build(1, 0, 1) } -} \ No newline at end of file +} diff --git a/tasks-standard/src/test/scala/TestRunnerSort.scala b/tasks-standard/src/test/scala/TestRunnerSort.scala index b7458b395..82fddcc58 100644 --- a/tasks-standard/src/test/scala/TestRunnerSort.scala +++ b/tasks-standard/src/test/scala/TestRunnerSort.scala @@ -6,8 +6,6 @@ package sbt import org.scalacheck._ import Prop._ import TaskGen._ -import Task._ -import sbt.internal.util.Types._ object TaskRunnerSortTest extends Properties("TaskRunnerSort") { property("sort") = forAll(TaskListGen, MaxWorkersGen) { (list: List[Int], workers: Int) =>