diff options
| author | Leway Colin | 2019-06-19 05:22:47 +0800 |
|---|---|---|
| committer | Adam Izraelevitz | 2019-06-18 14:22:47 -0700 |
| commit | fb4133cd76600cc8707e9a7b2f639cf120bd825c (patch) | |
| tree | 7532f341dc95f293fa02e4d015d1a6a0fac102ba /src/main/scala/firrtl/transforms | |
| parent | d1d422670eb406567b2e34d7036a5cc0262309a1 (diff) | |
Use scalafix to remove unused import and deprecated procedure syntax (#1074)
* Add sbt-scalafix
* Add scalafix guide to README
* Remove Unused Import
* Remove deprecated procedure syntax
Diffstat (limited to 'src/main/scala/firrtl/transforms')
8 files changed, 7 insertions, 22 deletions
diff --git a/src/main/scala/firrtl/transforms/BlackBoxSourceHelper.scala b/src/main/scala/firrtl/transforms/BlackBoxSourceHelper.scala index 61045c00..4a253740 100644 --- a/src/main/scala/firrtl/transforms/BlackBoxSourceHelper.scala +++ b/src/main/scala/firrtl/transforms/BlackBoxSourceHelper.scala @@ -5,7 +5,6 @@ package firrtl.transforms import java.io.{File, FileNotFoundException, FileInputStream, FileOutputStream, PrintWriter} import firrtl._ -import firrtl.Utils.throwInternalError import firrtl.annotations._ import scala.collection.immutable.ListSet @@ -144,7 +143,7 @@ object BlackBoxSourceHelper { * @param file the file to write it into * @throws BlackBoxNotFoundException if the requested resource does not exist */ - def copyResourceToFile(name: String, file: File) { + def copyResourceToFile(name: String, file: File): Unit = { val in = getClass.getResourceAsStream(name) val out = new FileOutputStream(file) safeFile(name)(Iterator.continually(in.read).takeWhile(-1 != _).foreach(out.write)) @@ -153,7 +152,7 @@ object BlackBoxSourceHelper { val fileListName = "firrtl_black_box_resource_files.f" - def writeFileList(files: ListSet[File], targetDir: File) { + def writeFileList(files: ListSet[File], targetDir: File): Unit = { if (files.nonEmpty) { // We need the canonical path here, so verilator will create a path to the file that works from the targetDir, // and, so we can compare the list of files automatically included, with an explicit list provided by the client @@ -165,7 +164,7 @@ object BlackBoxSourceHelper { } } - def writeTextToFile(text: String, file: File) { + def writeTextToFile(text: String, file: File): Unit = { val out = new PrintWriter(file) out.write(text) out.close() diff --git a/src/main/scala/firrtl/transforms/CheckCombLoops.scala b/src/main/scala/firrtl/transforms/CheckCombLoops.scala index 17e1569b..24aaed80 100644 --- a/src/main/scala/firrtl/transforms/CheckCombLoops.scala +++ b/src/main/scala/firrtl/transforms/CheckCombLoops.scala @@ -3,11 +3,7 @@ package firrtl.transforms import scala.collection.mutable -import scala.collection.immutable.HashSet -import scala.collection.immutable.HashMap -import annotation.tailrec -import Function.tupled import firrtl._ import firrtl.ir._ @@ -18,7 +14,6 @@ import firrtl.Utils.throwInternalError import firrtl.graph.{MutableDiGraph,DiGraph} import firrtl.analyses.InstanceGraph import firrtl.options.{RegisteredTransform, ShellOption} -import scopt.OptionParser object CheckCombLoops { class CombLoopException(info: Info, mname: String, cycle: Seq[String]) extends PassException( diff --git a/src/main/scala/firrtl/transforms/ConstantPropagation.scala b/src/main/scala/firrtl/transforms/ConstantPropagation.scala index 76417d3a..e5008acb 100644 --- a/src/main/scala/firrtl/transforms/ConstantPropagation.scala +++ b/src/main/scala/firrtl/transforms/ConstantPropagation.scala @@ -10,7 +10,6 @@ import firrtl.Utils._ import firrtl.Mappers._ import firrtl.PrimOps._ import firrtl.graph.DiGraph -import firrtl.WrappedExpression.weq import firrtl.analyses.InstanceGraph import firrtl.annotations.TargetToken.Ref diff --git a/src/main/scala/firrtl/transforms/DeadCodeElimination.scala b/src/main/scala/firrtl/transforms/DeadCodeElimination.scala index 0c357267..a2f15776 100644 --- a/src/main/scala/firrtl/transforms/DeadCodeElimination.scala +++ b/src/main/scala/firrtl/transforms/DeadCodeElimination.scala @@ -8,14 +8,11 @@ import firrtl.annotations._ import firrtl.graph._ import firrtl.analyses.InstanceGraph import firrtl.Mappers._ -import firrtl.WrappedExpression._ -import firrtl.Utils.{throwInternalError, toWrappedExpression, kind} +import firrtl.Utils.{throwInternalError, kind} import firrtl.MemoizedHash._ import firrtl.options.{RegisteredTransform, ShellOption} -import scopt.OptionParser import collection.mutable -import java.io.{File, FileWriter} /** Dead Code Elimination (DCE) * diff --git a/src/main/scala/firrtl/transforms/GroupComponents.scala b/src/main/scala/firrtl/transforms/GroupComponents.scala index 6e149762..70ce37aa 100644 --- a/src/main/scala/firrtl/transforms/GroupComponents.scala +++ b/src/main/scala/firrtl/transforms/GroupComponents.scala @@ -4,9 +4,8 @@ import firrtl._ import firrtl.Mappers._ import firrtl.ir._ import firrtl.annotations.{Annotation, ComponentName} -import firrtl.passes.{InferTypes, LowerTypes, MemPortUtils, ResolveKinds} -import firrtl.Utils.kind -import firrtl.graph.{DiGraph, MutableDiGraph} +import firrtl.passes.{InferTypes, LowerTypes, ResolveKinds} +import firrtl.graph.MutableDiGraph import scala.collection.mutable diff --git a/src/main/scala/firrtl/transforms/OptimizationAnnotations.scala b/src/main/scala/firrtl/transforms/OptimizationAnnotations.scala index a66bd4ce..257dbf3a 100644 --- a/src/main/scala/firrtl/transforms/OptimizationAnnotations.scala +++ b/src/main/scala/firrtl/transforms/OptimizationAnnotations.scala @@ -4,7 +4,6 @@ package transforms import firrtl.annotations._ import firrtl.passes.PassException -import firrtl.transforms /** Indicate that DCE should not be run */ case object NoDCEAnnotation extends NoTargetAnnotation diff --git a/src/main/scala/firrtl/transforms/RemoveWires.scala b/src/main/scala/firrtl/transforms/RemoveWires.scala index 60f6cc31..825cdb60 100644 --- a/src/main/scala/firrtl/transforms/RemoveWires.scala +++ b/src/main/scala/firrtl/transforms/RemoveWires.scala @@ -8,7 +8,7 @@ import firrtl.Utils._ import firrtl.Mappers._ import firrtl.traversals.Foreachers._ import firrtl.WrappedExpression._ -import firrtl.graph.{DiGraph, MutableDiGraph, CyclicException} +import firrtl.graph.{MutableDiGraph, CyclicException} import scala.collection.mutable import scala.util.{Try, Success, Failure} diff --git a/src/main/scala/firrtl/transforms/TopWiring.scala b/src/main/scala/firrtl/transforms/TopWiring.scala index 4a6d17d4..a1161ac6 100644 --- a/src/main/scala/firrtl/transforms/TopWiring.scala +++ b/src/main/scala/firrtl/transforms/TopWiring.scala @@ -11,10 +11,7 @@ import firrtl.passes.{Pass, } import firrtl.annotations._ import firrtl.Mappers._ -import firrtl.graph._ -import java.io._ -import scala.io.Source import collection.mutable /** Annotation for optional output files, and what directory to put those files in (absolute path) **/ |
