aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJack Koenig2019-11-29 14:45:14 -0800
committerJack Koenig2019-11-29 14:45:14 -0800
commit3e626e39a1cdae0a376decaed27b842986a700e0 (patch)
tree509a1780ad55146dfc7697f33dc6d56846d1195c /src
parentfc014311740a7c31ed006fd2ab5ae7173c284a21 (diff)
Remove scala-logging fully in favor of our own logger
There was some vestigial logging that conflicts with the homebrewed logger used by most of the codebase
Diffstat (limited to 'src')
-rw-r--r--src/main/scala/firrtl/ExecutionOptionsManager.scala6
-rw-r--r--src/main/scala/firrtl/Parser.scala2
-rw-r--r--src/main/scala/firrtl/PrimOps.scala2
-rw-r--r--src/test/scala/firrtlTests/FirrtlSpec.scala2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/main/scala/firrtl/ExecutionOptionsManager.scala b/src/main/scala/firrtl/ExecutionOptionsManager.scala
index 3783db28..2e3cd096 100644
--- a/src/main/scala/firrtl/ExecutionOptionsManager.scala
+++ b/src/main/scala/firrtl/ExecutionOptionsManager.scala
@@ -2,14 +2,14 @@
package firrtl
+import logger.LogLevel
+import logger.{ClassLogLevelAnnotation, LogClassNamesAnnotation, LogFileAnnotation, LogLevelAnnotation}
import firrtl.annotations._
-import firrtl.Parser._
+import firrtl.Parser.{InfoMode, UseInfo, IgnoreInfo, GenInfo, AppendInfo}
import firrtl.ir.Circuit
import firrtl.passes.memlib.{InferReadWriteAnnotation, ReplSeqMemAnnotation}
import firrtl.passes.clocklist.ClockListAnnotation
import firrtl.transforms.NoCircuitDedupAnnotation
-import logger.LogLevel
-import logger.{ClassLogLevelAnnotation, LogClassNamesAnnotation, LogFileAnnotation, LogLevelAnnotation}
import scopt.OptionParser
import firrtl.stage.{CompilerAnnotation, FirrtlCircuitAnnotation, FirrtlFileAnnotation, FirrtlSourceAnnotation,
InfoModeAnnotation, OutputFileAnnotation, RunFirrtlTransformAnnotation}
diff --git a/src/main/scala/firrtl/Parser.scala b/src/main/scala/firrtl/Parser.scala
index 4e26d642..ddc858e4 100644
--- a/src/main/scala/firrtl/Parser.scala
+++ b/src/main/scala/firrtl/Parser.scala
@@ -4,7 +4,7 @@ package firrtl
import org.antlr.v4.runtime._
import org.antlr.v4.runtime.atn._
-import com.typesafe.scalalogging.LazyLogging
+import logger.LazyLogging
import firrtl.ir._
import firrtl.Utils.time
import firrtl.antlr.{FIRRTLParser, _}
diff --git a/src/main/scala/firrtl/PrimOps.scala b/src/main/scala/firrtl/PrimOps.scala
index 02404f70..cbe3a027 100644
--- a/src/main/scala/firrtl/PrimOps.scala
+++ b/src/main/scala/firrtl/PrimOps.scala
@@ -2,8 +2,8 @@
package firrtl
+import logger.LazyLogging
import firrtl.ir._
-import com.typesafe.scalalogging.LazyLogging
import Implicits.{constraint2bound, constraint2width, width2constraint}
import firrtl.constraint._
diff --git a/src/test/scala/firrtlTests/FirrtlSpec.scala b/src/test/scala/firrtlTests/FirrtlSpec.scala
index efbb27de..1ff5b72f 100644
--- a/src/test/scala/firrtlTests/FirrtlSpec.scala
+++ b/src/test/scala/firrtlTests/FirrtlSpec.scala
@@ -5,7 +5,7 @@ package firrtlTests
import java.io._
import java.security.Permission
-import com.typesafe.scalalogging.LazyLogging
+import logger.LazyLogging
import scala.sys.process._
import org.scalatest._