From bd50a1a4bcc9ffe492dec8f33784446727f33647 Mon Sep 17 00:00:00 2001 From: Henry Cook Date: Wed, 25 Oct 2017 11:54:47 -0700 Subject: [PATCH] config: remove deprecated Parameters.root --- src/main/scala/config/Config.scala | 3 +-- src/main/scala/util/GeneratorUtils.scala | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/scala/config/Config.scala b/src/main/scala/config/Config.scala index 1da72b77..ebed6b6e 100644 --- a/src/main/scala/config/Config.scala +++ b/src/main/scala/config/Config.scala @@ -40,9 +40,8 @@ abstract class Parameters extends View { } object Parameters { - def empty: Parameters = new EmptyParameters + def empty: Parameters = new EmptyParameters def apply(f: (View, View, View) => PartialFunction[Any,Any]): Parameters = new PartialParameters(f) - def root(p: Parameters) = p } class Config(p: Parameters) extends Parameters { diff --git a/src/main/scala/util/GeneratorUtils.scala b/src/main/scala/util/GeneratorUtils.scala index 5d67ff32..7f401045 100644 --- a/src/main/scala/util/GeneratorUtils.scala +++ b/src/main/scala/util/GeneratorUtils.scala @@ -43,7 +43,7 @@ trait HasGeneratorUtilities { def getParameters(names: ParsedInputNames): Parameters = getParameters(getConfig(names)) - def getParameters(config: Config): Parameters = Parameters.root(config.toInstance) + def getParameters(config: Config): Parameters = config.toInstance def elaborate(names: ParsedInputNames, params: Parameters): Circuit = { val gen = () => @@ -97,8 +97,7 @@ trait GeneratorApp extends App with HasGeneratorUtilities { // Canonical ways of building various JVM elaboration-time structures lazy val td = names.targetDir lazy val config = getConfig(names) - lazy val world = config.toInstance - lazy val params = Parameters.root(world) + lazy val params = config.toInstance lazy val circuit = elaborate(names, params) val longName: String // Exhaustive name used to interface with external build tool targets