move logger into firrtl2 namespace (#19)

src/main/scala/firrtl2/Compiler.scala

@@ -2,18 +2,15 @@
 
 package firrtl2
 
-import logger._
 import java.io.Writer
-
 import scala.collection.mutable
 import scala.collection.immutable.VectorBuilder
-import scala.util.Try
-import scala.util.control.NonFatal
 import firrtl2.annotations._
 import firrtl2.ir.Circuit
 import firrtl2.Utils.throwInternalError
 import firrtl2.annotations.transforms.{EliminateTargetPaths, ResolvePaths}
-import firrtl2.options.{Dependency, DependencyAPI, StageUtils, TransformLike}
+import firrtl2.logger.{LazyLogging, Logger}
+import firrtl2.options.{Dependency, DependencyAPI, TransformLike}
 import firrtl2.stage.Forms
 import firrtl2.transforms.DedupAnnotationsTransform
 

src/main/scala/firrtl2/Parser.scala

@@ -4,11 +4,11 @@ package firrtl2
 
 import org.antlr.v4.runtime._
 import org.antlr.v4.runtime.atn._
-import logger.LazyLogging
 import firrtl2.ir._
 import firrtl2.parser.Listener
 import firrtl2.Utils.time
 import firrtl2.antlr._
+import firrtl2.logger.LazyLogging
 
 import scala.util.control.NonFatal
 

src/main/scala/firrtl2/PrimOps.scala

@@ -2,10 +2,10 @@
 
 package firrtl2
 
-import logger.LazyLogging
 import firrtl2.ir._
 import Implicits.{constraint2bound, constraint2width, width2constraint}
 import firrtl2.constraint._
+import firrtl2.logger.LazyLogging
 
 /** Definitions and Utility functions for [[ir.PrimOp]]s */
 object PrimOps extends LazyLogging {

src/main/scala/firrtl2/Utils.scala

@@ -14,7 +14,7 @@ import scala.util.matching.Regex
 import Implicits.{constraint2bound, constraint2width, width2constraint}
 import firrtl2.constraint.{IsMax, IsMin}
 import firrtl2.annotations.{ReferenceTarget, TargetToken}
-import _root_.logger.LazyLogging
+import firrtl2.logger.LazyLogging
 
 object seqCat {
   def apply(args: Seq[Expression]): Expression = args.length match {

src/main/scala/firrtl2/annotations/JsonProtocol.scala

@@ -4,11 +4,10 @@ package firrtl2
 package annotations
 
 import firrtl2.ir._
+import firrtl2.logger.LazyLogging
 import firrtl2.stage.AllowUnrecognizedAnnotations
-import logger.LazyLogging
 
 import scala.util.{Failure, Success, Try}
-
 import org.json4s._
 import org.json4s.native.JsonMethods._
 import org.json4s.native.Serialization

src/main/scala/firrtl2/backends/experimental/smt/FirrtlToTransitionSystem.scala

@@ -6,14 +6,14 @@ package firrtl2.backends.experimental.smt
 import firrtl2.annotations.{MemoryInitAnnotation, NoTargetAnnotation, PresetRegAnnotation}
 import firrtl2._
 import firrtl2.backends.experimental.smt.random._
+import firrtl2.logger.LazyLogging
 import firrtl2.options.Dependency
 import firrtl2.passes.MemPortUtils.memPortField
 import firrtl2.passes.PassException
 import firrtl2.passes.memlib.VerilogMemDelays
 import firrtl2.stage.Forms
 import firrtl2.stage.TransformManager.TransformDependency
 import firrtl2.transforms.{EnsureNamedStatements, PropagatePresetAnnotations}
-import logger.LazyLogging
 
 import scala.collection.mutable
 

src/main/scala/logger/Logger.scala → src/main/scala/firrtl2/logger/Logger.scala

@@ -1,12 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package logger
+package firrtl2.logger
 
 import java.io.{ByteArrayOutputStream, File, FileOutputStream, PrintStream}
-
 import firrtl2.AnnotationSeq
+import firrtl2.logger.phases.{AddDefaults, Checks}
 import firrtl2.options.Viewer.view
-import logger.phases.{AddDefaults, Checks}
 
 import scala.util.DynamicVariable
 

src/main/scala/logger/LoggerAnnotations.scala → src/main/scala/firrtl2/logger/LoggerAnnotations.scala

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package logger
+package firrtl2.logger
 
 import firrtl2.annotations.{Annotation, NoTargetAnnotation}
 import firrtl2.options.{HasShellOptions, ShellOption}

src/main/scala/logger/LoggerOptions.scala → src/main/scala/firrtl2/logger/LoggerOptions.scala

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package logger
+package firrtl2.logger
 
 /** Internal options used to control the logging in programs that are part of the Chisel stack
   *
-  * @param globalLogLevel the verbosity of logging (default: [[logger.LogLevel.None]])
+  * @param globalLogLevel the verbosity of logging (default: [[LogLevel.None]])
   * @param classLogLevels the individual verbosity of logging for specific classes
   * @param logToFile      if true, log to a file
   * @param logClassNames  indicates logging verbosity on a class-by-class basis

src/main/scala/logger/package.scala → src/main/scala/firrtl2/logger/package.scala

@@ -1,3 +1,5 @@
+package firrtl2
+
 // SPDX-License-Identifier: Apache-2.0
 
 import firrtl2.AnnotationSeq

src/main/scala/logger/phases/AddDefaults.scala → src/main/scala/firrtl2/logger/phases/AddDefaults.scala

@@ -1,12 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package logger.phases
+package firrtl2.logger.phases
 
 import firrtl2.AnnotationSeq
+import firrtl2.logger.{LogLevelAnnotation, LoggerOption}
 import firrtl2.options.Phase
 
-import logger.{LogLevelAnnotation, LoggerOption}
-
 /** Add default logger [[Annotation]]s */
 private[logger] class AddDefaults extends Phase {
 

src/main/scala/logger/phases/Checks.scala → src/main/scala/firrtl2/logger/phases/Checks.scala

@@ -1,13 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package logger.phases
+package firrtl2.logger.phases
 
 import firrtl2.AnnotationSeq
 import firrtl2.annotations.Annotation
+import firrtl2.logger.{LogFileAnnotation, LogLevelAnnotation, LoggerException}
 import firrtl2.options.{Dependency, Phase}
 
-import logger.{LogFileAnnotation, LogLevelAnnotation, LoggerException}
-
 import scala.collection.mutable
 
 /** Check that an [[firrtl2.AnnotationSeq AnnotationSeq]] has all necessary [[firrtl2.annotations.Annotation Annotation]]s

src/main/scala/firrtl2/options/Phase.scala

@@ -3,8 +3,7 @@
 package firrtl2.options
 
 import firrtl2.AnnotationSeq
-
-import logger.LazyLogging
+import firrtl2.logger.LazyLogging
 
 import scala.collection.mutable.LinkedHashSet
 

src/main/scala/firrtl2/options/Shell.scala

@@ -3,8 +3,7 @@
 package firrtl2.options
 
 import firrtl2.AnnotationSeq
-
-import logger.{ClassLogLevelAnnotation, LogClassNamesAnnotation, LogFileAnnotation, LogLevelAnnotation}
+import firrtl2.logger.{ClassLogLevelAnnotation, LogClassNamesAnnotation, LogFileAnnotation, LogLevelAnnotation}
 
 import scopt.OptionParser
 

src/main/scala/firrtl2/options/Stage.scala

@@ -3,8 +3,7 @@
 package firrtl2.options
 
 import firrtl2.AnnotationSeq
-
-import logger.Logger
+import firrtl2.logger.Logger
 
 /** A [[Stage]] represents one stage in the FIRRTL hardware compiler framework. A [[Stage]] is, conceptually, a
   * [[Phase]] that includes a command line interface.

src/main/scala/firrtl2/stage/transforms/WrappedTransform.scala

@@ -3,8 +3,7 @@
 package firrtl2.stage.transforms
 
 import firrtl2.Transform
-
-import logger.Logger
+import firrtl2.logger.Logger
 
 /** A [[firrtl2.Transform]] that "wraps" a second [[firrtl2.Transform Transform]] to do some work before and after the
   * second [[firrtl2.Transform Transform]].

src/main/scala/firrtl2/util/BackendCompilationUtilities.scala

@@ -7,9 +7,8 @@ import java.nio.file.Files
 import java.text.SimpleDateFormat
 import java.util.Calendar
 
-import logger.LazyLogging
-
 import firrtl2.FileUtils
+import firrtl2.logger.LazyLogging
 
 import scala.sys.process.{ProcessBuilder, ProcessLogger, _}
 

src/test/scala/firrtl2/backends/experimental/rtlil/end2end/RtlilCompilationTest.scala

@@ -2,9 +2,9 @@
 
 package firrtl2.backends.experimental.rtlil.end2end
 
+import firrtl2.logger.LazyLogging
 import firrtl2.stage.{FirrtlStage, OutputFileAnnotation}
 import firrtl2.util.BackendCompilationUtilities
-import logger.LazyLogging
 import org.scalatest.flatspec.AnyFlatSpec
 
 import java.io.File

src/test/scala/firrtl2/backends/experimental/rtlil/end2end/RtlilEquivalenceTest.scala

@@ -2,9 +2,9 @@
 
 package firrtl2.backends.experimental.rtlil.end2end
 
+import firrtl2.logger.LazyLogging
 import firrtl2.stage.{FirrtlStage, OutputFileAnnotation}
 import firrtl2.util.BackendCompilationUtilities
-import logger.LazyLogging
 import org.scalatest.flatspec.AnyFlatSpec
 
 import java.io.File

src/test/scala/firrtl2/backends/experimental/smt/end2end/EndToEndSMTSpec.scala

@@ -5,10 +5,10 @@ package firrtl2.backends.experimental.smt.end2end
 import firrtl2.annotations.{Annotation, CircuitTarget, PresetAnnotation}
 import firrtl2.backends.experimental.smt.random.{InvalidToRandomPass, UndefinedMemoryBehaviorPass}
 import firrtl2.backends.experimental.smt.{Btor2Emitter, SMTLibEmitter}
+import firrtl2.logger.{LazyLogging, LogLevel, LogLevelAnnotation}
 import firrtl2.options.{Dependency, TargetDirAnnotation}
 import firrtl2.stage.{FirrtlCircuitAnnotation, FirrtlStage, OutputFileAnnotation, RunFirrtlTransformAnnotation}
 import firrtl2.util.BackendCompilationUtilities.timeStamp
-import logger.{LazyLogging, LogLevel, LogLevelAnnotation}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.must.Matchers
 import os._

src/test/scala/firrtl2/backends/experimental/smt/end2end/SMTCompilationTest.scala

@@ -2,11 +2,11 @@
 
 package firrtl2.backends.experimental.smt.end2end
 
+import firrtl2.logger.LazyLogging
 import java.io.File
 
 import firrtl2.stage.{FirrtlStage, OutputFileAnnotation}
 import firrtl2.util.BackendCompilationUtilities
-import logger.LazyLogging
 import org.scalatest.flatspec.AnyFlatSpec
 
 import scala.sys.process.{Process, ProcessLogger}

src/test/scala/firrtl2/testutils/FirrtlSpec.scala

@@ -5,8 +5,6 @@ package firrtl2.testutils
 import java.io._
 import scala.sys.process._
 
-import logger.{LazyLogging, LogLevel, LogLevelAnnotation}
-
 import org.scalatest._
 import org.scalatestplus.scalacheck._
 
@@ -17,6 +15,7 @@ import firrtl2.options.Dependency
 import firrtl2.stage.{FirrtlFileAnnotation, InfoModeAnnotation, RunFirrtlTransformAnnotation}
 import firrtl2.analyses.{GetNamespace, ModuleNamespaceAnnotation}
 import firrtl2.annotations._
+import firrtl2.logger.{LazyLogging, LogLevel, LogLevelAnnotation}
 import firrtl2.transforms.{DontTouchAnnotation, NoDedupAnnotation, RenameModules}
 import firrtl2.renamemap.MutableRenameMap
 import firrtl2.util.BackendCompilationUtilities

src/test/scala/firrtl2/testutils/LeanTransformSpec.scala

@@ -2,11 +2,11 @@
 
 package firrtl2.testutils
 
+import firrtl2.logger.LazyLogging
 import firrtl2.{ir, AnnotationSeq, CircuitState, EmitCircuitAnnotation}
 import firrtl2.options.Dependency
 import firrtl2.passes.RemoveEmpty
 import firrtl2.stage.TransformManager.TransformDependency
-import logger.LazyLogging
 import org.scalatest.flatspec.AnyFlatSpec
 
 class VerilogTransformSpec extends LeanTransformSpec(Seq(Dependency[firrtl2.VerilogEmitter]))

src/test/scala/firrtlTests/annotationTests/JsonProtocolSpec.scala

@@ -8,7 +8,7 @@ import firrtl2.ir._
 import firrtl2.options.Dependency
 import firrtl2.transforms.DontTouchAnnotation
 import scala.util.Failure
-import _root_.logger.{LogLevel, LogLevelAnnotation, Logger}
+import firrtl2.logger.{LogLevel, LogLevelAnnotation, Logger}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should._
 import org.scalatest.Inside._

src/test/scala/firrtlTests/annotationTests/UnrecognizedAnnotationSpec.scala

@@ -4,12 +4,12 @@ package firrtlTests.annotationTests
 
 import firrtl2.FileUtils
 import firrtl2.annotations._
+import firrtl2.logger.Logger
 import firrtl2.passes.memlib.ReplSeqMemAnnotation
 import firrtl2.stage.FirrtlMain
 import firrtl2.testutils.FirrtlFlatSpec
 import firrtl2.transforms.BlackBoxInlineAnno
-import logger.Logger
-import logger.Logger.OutputCaptor
+import Logger.OutputCaptor
 import org.json4s.convertToJsonInput
 
 import java.io.{File, PrintWriter}

src/test/scala/firrtlTests/formal/VerificationSpec.scala

@@ -2,9 +2,9 @@
 
 package firrtlTests.formal
 
+import firrtl2.logger.{LogLevel, Logger}
 import firrtl2.{ir, CircuitState, SystemVerilogCompiler}
 import firrtl2.testutils.FirrtlFlatSpec
-import logger.{LogLevel, Logger}
 import firrtl2.options.Dependency
 import firrtl2.stage.TransformManager
 

src/test/scala/firrtlTests/transforms/BlackBoxSourceHelperSpec.scala

@@ -9,9 +9,10 @@ import firrtl2.FileUtils
 import firrtl2.testutils.LowTransformSpec
 import firrtl2.stage._
 import firrtl2.options.Dependency
+
 import java.io.File
 import firrtl2.util.BackendCompilationUtilities.createTestDirectory
-import _root_.logger._
+import firrtl2.logger.{LogLevel, LogLevelAnnotation}
 
 class ChangeBlackBoxTargetDir extends Transform with DependencyAPIMigration {
   override def prerequisites =

src/test/scala/firrtlTests/transforms/MustDedupSpec.scala

@@ -11,13 +11,13 @@ import firrtl2.graph.DiGraph
 import firrtl2.analyses.InstanceKeyGraph
 import firrtl2.annotations.CircuitTarget
 import firrtl2.annotations.TargetToken.OfModule
+import firrtl2.logger.{LogLevel, LogLevelAnnotation, Logger}
 import firrtl2.transforms._
 import firrtl2.transforms.MustDeduplicateTransform._
 import firrtl2.transforms.MustDeduplicateTransform.DisjointChildren._
 import firrtl2.util.BackendCompilationUtilities.createTestDirectory
 import firrtl2.stage.{FirrtlSourceAnnotation, RunFirrtlTransformAnnotation}
 import firrtl2.options.TargetDirAnnotation
-import logger.{LogLevel, LogLevelAnnotation, Logger}
 
 class MustDedupSpec extends AnyFeatureSpec with FirrtlMatchers with GivenWhenThen {
 

src/test/scala/loggertests/LoggerSpec.scala

@@ -2,8 +2,8 @@
 
 package loggertests
 
-import logger.Logger.OutputCaptor
-import logger.{LazyLogging, LogLevel, Logger}
+import firrtl2.logger.{LazyLogging, LogLevel, Logger}
+import firrtl2.logger.Logger.OutputCaptor
 import org.scalatest.OneInstancePerTest
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.should.Matchers