From b7dd35e9cdeecb2d5125ef1d8802d5af17bff4ab Mon Sep 17 00:00:00 2001
From: Jiuyang Liu
Date: Tue, 30 Nov 2021 08:54:07 +0800
Subject: [deprecation clean up] remove firrtl.ExecutionOptionsManager (#2422)

Also remove all related APIs:

ComposableOptions
HasParser
CommonOptions
HasCommonOptions
FirrtlExecutionOptions
HasFirrtlOptions
FirrtlExecutionResult
FirrtlExecutionSuccess
FirrtlExecutionFailure
ExecutionOptionsManager
firrtl.stage.DriverCompatibility.firrtlResultView
logger.Logger.makeScope
OutputConfig
SingleFile
OneFilePerModule

* Change default LogLevel to None which means "unset"

Logger.getGlobalLevel then returns LogLevel.Warn when the current value
is LogLevel.None. This preserves the behavior of the default being
"Warn" but now uses LogLevel.None to indicate "I'm not setting the
value." This resolves issues where it was not possible to tell if
annotations were actually setting the log level or if the default level
of warn was just being filled in.

Co-authored-by: sinofp <sinofp@tuta.io>
Co-authored-by: Jack Koenig <koenig@sifive.com>---
 .../firrtlTests/ExecutionOptionsManagerSpec.scala  | 54 ----------------------
 src/test/scala/firrtlTests/ParserSpec.scala        |  3 --
 2 files changed, 57 deletions(-)
 delete mode 100644 src/test/scala/firrtlTests/ExecutionOptionsManagerSpec.scala

(limited to 'src/test/scala/firrtlTests')

diff --git a/src/test/scala/firrtlTests/ExecutionOptionsManagerSpec.scala b/src/test/scala/firrtlTests/ExecutionOptionsManagerSpec.scala
deleted file mode 100644
index f176fe38..00000000
--- a/src/test/scala/firrtlTests/ExecutionOptionsManagerSpec.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-
-package firrtlTests
-
-import firrtl._
-import org.scalatest.freespec.AnyFreeSpec
-import org.scalatest.matchers.should.Matchers
-
-class ExecutionOptionsManagerSpec extends AnyFreeSpec with Matchers {
-  "ExecutionOptionsManager is a container for one more more ComposableOptions Block" - {
-    "It has a default CommonOptionsBlock" in {
-      val manager = new ExecutionOptionsManager("test")
-      manager.topName should be("")
-      manager.targetDirName should be(".")
-      manager.commonOptions.topName should be("")
-      manager.commonOptions.targetDirName should be(".")
-    }
-    "But can override defaults like this" in {
-      val manager = new ExecutionOptionsManager("test") {
-        commonOptions = CommonOptions(topName = "dog", targetDirName = "a/b/c")
-      }
-      manager.commonOptions shouldBe a[CommonOptions]
-      manager.topName should be("dog")
-      manager.targetDirName should be("a/b/c")
-      manager.commonOptions.topName should be("dog")
-      manager.commonOptions.targetDirName should be("a/b/c")
-    }
-    "The add method should put a new version of a given type the manager" in {
-      val manager = new ExecutionOptionsManager("test") {
-        commonOptions = CommonOptions(topName = "dog", targetDirName = "a/b/c")
-      }
-      val initialCommon = manager.commonOptions
-      initialCommon.topName should be("dog")
-      initialCommon.targetDirName should be("a/b/c")
-
-      manager.commonOptions = CommonOptions(topName = "cat", targetDirName = "d/e/f")
-
-      val afterCommon = manager.commonOptions
-      afterCommon.topName should be("cat")
-      afterCommon.targetDirName should be("d/e/f")
-      initialCommon.topName should be("dog")
-      initialCommon.targetDirName should be("a/b/c")
-    }
-    "multiple composable blocks should be separable" in {
-      val manager = new ExecutionOptionsManager("test") with HasFirrtlOptions {
-        commonOptions = CommonOptions(topName = "spoon")
-        firrtlOptions = FirrtlExecutionOptions(inputFileNameOverride = "fork")
-      }
-
-      manager.firrtlOptions.inputFileNameOverride should be("fork")
-      manager.commonOptions.topName should be("spoon")
-    }
-  }
-}
diff --git a/src/test/scala/firrtlTests/ParserSpec.scala b/src/test/scala/firrtlTests/ParserSpec.scala
index 57b468ea..89e73cb7 100644
--- a/src/test/scala/firrtlTests/ParserSpec.scala
+++ b/src/test/scala/firrtlTests/ParserSpec.scala
@@ -312,9 +312,6 @@ class ParserSpec extends FirrtlFlatSpec {
                    |    bar.a <- a
                    |    b <- bar.b
       """.stripMargin
-    val manager = new ExecutionOptionsManager("test") with HasFirrtlOptions {
-      firrtlOptions = FirrtlExecutionOptions(firrtlSource = Some(input))
-    }
     a[SyntaxErrorsException] shouldBe thrownBy {
       (new FirrtlStage).execute(Array(), Seq(FirrtlSourceAnnotation(input)))
     }
-- 
cgit v1.2.3