Skip to content

Commit d473fdf

Browse files
authored
[scala3] Fix compiler warnings, NFC (#5080)
Fix Scala3 compilation warnings, except those related to private bundle constructors. Signed-off-by: Schuyler Eldridge <[email protected]>
1 parent 81372f1 commit d473fdf

File tree

6 files changed

+7
-16
lines changed

6 files changed

+7
-16
lines changed

core/src/main/scala/chisel3/internal/Builder.scala

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -930,11 +930,6 @@ private[chisel3] object Builder extends LazyLogging {
930930
throwException(m)
931931
}
932932

933-
def getScalaMajorVersion: Int = {
934-
val "2" :: major :: _ :: Nil = chisel3.BuildInfo.scalaVersion.split("\\.").toList
935-
major.toInt
936-
}
937-
938933
def useLegacyWidth: Boolean = dynamicContextVar.value.map(_.useLegacyWidth).getOrElse(false)
939934

940935
def includeUtilMetadata: Boolean = dynamicContextVar.value.map(_.includeUtilMetadata).getOrElse(false)
@@ -1067,9 +1062,8 @@ private[chisel3] object Builder extends LazyLogging {
10671062
errors.checkpoint(logger)
10681063
logger.info("Done elaborating.")
10691064

1070-
val typeAliases = aliasMap.flatMap {
1071-
case (name, (underlying: fir.Type, info: SourceInfo)) => Some(DefTypeAlias(info, underlying, name))
1072-
case _ => None
1065+
val typeAliases = aliasMap.flatMap { case (name, (underlying: fir.Type, info: SourceInfo)) =>
1066+
Some(DefTypeAlias(info, underlying, name))
10731067
}.toSeq
10741068

10751069
/** Stores an adjacency list representation of layers. Connections indicating children. */

core/src/main/scala/chisel3/internal/firrtl/IR.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ private[chisel3] object ir {
471471
sealed abstract class LayerConfig
472472
object LayerConfig {
473473
final case class Extract(outputDir: Option[String]) extends LayerConfig
474-
final case object Inline extends LayerConfig
474+
case object Inline extends LayerConfig
475475
}
476476

477477
final case class Layer(

firrtl/src/main/scala/firrtl/ir/IR.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ sealed abstract class LayerConfig
484484
@deprecated("All APIs in package firrtl are deprecated.", "Chisel 7.0.0")
485485
object LayerConfig {
486486
final case class Extract(outputDir: Option[String]) extends LayerConfig
487-
final case object Inline extends LayerConfig
487+
case object Inline extends LayerConfig
488488
}
489489

490490
@deprecated("All APIs in package firrtl are deprecated.", "Chisel 7.0.0")

firrtl/src/main/scala/firrtl/ir/Serializer.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,6 @@ object Serializer {
494494
private def s(node: Direction)(implicit b: StringBuilder, indent: Int): Unit = node match {
495495
case Input => b ++= "input"
496496
case Output => b ++= "output"
497-
case other => b ++= other.serialize // Handle user-defined nodes
498497
}
499498

500499
private def s(node: Port)(implicit b: StringBuilder, indent: Int): Unit = node match {
@@ -519,7 +518,6 @@ object Serializer {
519518
case RawStringParam(name, value) =>
520519
b ++= name; b ++= " = "
521520
b += '\''; b ++= value.replace("'", "\\'"); b += '\''
522-
case other => b ++= other.serialize // Handle user-defined nodes
523521
}
524522

525523
private def s(node: TestParam)(implicit b: StringBuilder, indent: Int): Unit = node match {
@@ -540,7 +538,6 @@ object Serializer {
540538
b ++= name; b ++= " = "; s(value(name))
541539
}
542540
b ++= "}"
543-
case other => b ++= other.serialize // Handle user-defined nodes
544541
}
545542

546543
private def sIt(node: DefModule)(implicit indent: Int): Iterator[String] = node match {

svsim/src/main/scala/Workspace.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ final class Workspace(
489489
.replace("$", "$$")
490490
.replace("'", "'\\''")
491491
.replace(workingDirectoryPath, "$(shell pwd)")
492-
l("\t\t'", sanitizedArugment, "' \\")
492+
l("\t\t'", sanitizedArugment, "' \\")
493493
}
494494
l("'-F' \\")
495495
l(s"\t\t'${sourceFilesFilelistWriter.path}'")
@@ -519,7 +519,7 @@ final class Workspace(
519519
l("simulationEnvironment = \\")
520520
for (((name, value), index) <- simulationEnvironment.zipWithIndex) {
521521
val sanitizedValue = value.replace(workingDirectoryPath, "$(shell pwd)")
522-
l("\t", name, "=", sanitizedValue, if (index != simulationEnvironment.length - 1) " \\" else "")
522+
l("\t", name, "=", sanitizedValue, if (index != simulationEnvironment.length - 1) " \\" else "")
523523
}
524524
l()
525525
//format: on

svsim/src/main/scala/vcs/Backend.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ object Backend {
4949
case object TMerge extends XProp
5050
}
5151

52-
final object TraceSettings {
52+
object TraceSettings {
5353
final case class FsdbSettings(verdiHome: String)
5454
}
5555
final case class TraceSettings(

0 commit comments

Comments
 (0)