aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJack Koenig2020-08-14 19:48:35 -0700
committerJack Koenig2020-08-14 19:48:35 -0700
commit9adbe1ede59f9aeb25e71fd8318a4e7e46c4cc34 (patch)
treef06060e9fb52f4f5b30bc56db78acb6bd371642d /src
parent6fc742bfaf5ee508a34189400a1a7dbffe3f1cac (diff)
Apply scalafmt again
Diffstat (limited to 'src')
-rw-r--r--src/main/scala/firrtl/passes/wiring/WiringUtils.scala8
-rw-r--r--src/main/scala/firrtl/stage/phases/Checks.scala10
-rw-r--r--src/main/scala/logger/phases/Checks.scala6
-rw-r--r--src/test/scala/firrtlTests/VerilogEmitterTests.scala11
4 files changed, 23 insertions, 12 deletions
diff --git a/src/main/scala/firrtl/passes/wiring/WiringUtils.scala b/src/main/scala/firrtl/passes/wiring/WiringUtils.scala
index 5e8f8616..59b042f5 100644
--- a/src/main/scala/firrtl/passes/wiring/WiringUtils.scala
+++ b/src/main/scala/firrtl/passes/wiring/WiringUtils.scala
@@ -56,7 +56,9 @@ case class Lineage(
def shortSerialize(tab: String): String = s"""
|$tab name: $name,
- |$tab children: ${children.map(c => tab + " " + c._2.shortSerialize(tab + " "))}
+ |$tab children: ${children.map(c =>
+ tab + " " + c._2.shortSerialize(tab + " ")
+ )}
|""".stripMargin
def foldLeft[B](z: B)(op: (B, (String, Lineage)) => B): B =
@@ -71,7 +73,9 @@ case class Lineage(
|$tab sharedParent: $sharedParent,
|$tab addPort: $addPort
|$tab cons: $cons
- |$tab children: ${children.map(c => tab + " " + c._2.serialize(tab + " "))}
+ |$tab children: ${children.map(c =>
+ tab + " " + c._2.serialize(tab + " ")
+ )}
|""".stripMargin
}
diff --git a/src/main/scala/firrtl/stage/phases/Checks.scala b/src/main/scala/firrtl/stage/phases/Checks.scala
index 6576d311..24cfa0a3 100644
--- a/src/main/scala/firrtl/stage/phases/Checks.scala
+++ b/src/main/scala/firrtl/stage/phases/Checks.scala
@@ -55,10 +55,12 @@ class Checks extends Phase {
/* Only one FIRRTL input can exist */
if (inF.size + inS.size + inC.size > 1) {
- throw new OptionsException(s"""|Multiply defined input FIRRTL sources. More than one of the following was found:
- | - an input file (${inF.size} times): -i, --input-file, FirrtlFileAnnotation
- | - FIRRTL source (${inS.size} times): --firrtl-source, FirrtlSourceAnnotation
- | - FIRRTL circuit (${inC.size} times): FirrtlCircuitAnnotation""".stripMargin)
+ throw new OptionsException(
+ s"""|Multiply defined input FIRRTL sources. More than one of the following was found:
+ | - an input file (${inF.size} times): -i, --input-file, FirrtlFileAnnotation
+ | - FIRRTL source (${inS.size} times): --firrtl-source, FirrtlSourceAnnotation
+ | - FIRRTL circuit (${inC.size} times): FirrtlCircuitAnnotation""".stripMargin
+ )
}
/* Specifying an output file and one-file-per module conflict */
diff --git a/src/main/scala/logger/phases/Checks.scala b/src/main/scala/logger/phases/Checks.scala
index 0109c7ad..707118e3 100644
--- a/src/main/scala/logger/phases/Checks.scala
+++ b/src/main/scala/logger/phases/Checks.scala
@@ -40,8 +40,10 @@ object Checks extends Phase {
)
}
if (lf.size > 1) {
- throw new LoggerException(s"""|At most one log file can be specified, but found ${lf.size} combinations of:
- | - an options or annotation: -ltf, --log-to-file, --log-file, LogFileAnnotation""".stripMargin)
+ throw new LoggerException(
+ s"""|At most one log file can be specified, but found ${lf.size} combinations of:
+ | - an options or annotation: -ltf, --log-to-file, --log-file, LogFileAnnotation""".stripMargin
+ )
}
annotations
}
diff --git a/src/test/scala/firrtlTests/VerilogEmitterTests.scala b/src/test/scala/firrtlTests/VerilogEmitterTests.scala
index 9840229e..42f0bf85 100644
--- a/src/test/scala/firrtlTests/VerilogEmitterTests.scala
+++ b/src/test/scala/firrtlTests/VerilogEmitterTests.scala
@@ -373,10 +373,13 @@ class VerilogEmitterSpec extends FirrtlFlatSpec {
val renderer = emitter.getRenderer(module, moduleMap)(writer)
- renderer.emitVerilogBind("BindsToTest", """
- |$readmemh("file", memory);
- |
- |""".stripMargin)
+ renderer.emitVerilogBind(
+ "BindsToTest",
+ """
+ |$readmemh("file", memory);
+ |
+ |""".stripMargin
+ )
val lines = writer.toString.split("\n")
val outString = writer.toString