Style fixes

3 files changed, 14 insertions, 29 deletions

diff --git a/chiselFrontend/src/main/scala/chisel3/core/Bits.scala b/chiselFrontend/src/main/scala/chisel3/core/Bits.scala
index ca38ef83..d39cc088 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/Bits.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/Bits.scala
@@ -81,22 +81,15 @@ sealed abstract class Bits(width: Width)
     case topBindingOpt => topBindingOpt
   }
 
-  override def elementLitArg: Option[LitArg] = litArgOption
-
   protected def litArgOption: Option[LitArg] = topBindingOpt match {
     case Some(ElementLitBinding(litArg)) => Some(litArg)
     case _ => None
   }
 
-  override def litToBigIntOption: Option[BigInt] = litArgOption match {
-    case Some(litArg) => Some(litArg.num)
-    case _ => None
-  }
+  override def litToBigIntOption: Option[BigInt] = litArgOption.map(_.num)
+  private[chisel3] def litIsForcedWidth: Option[Boolean] = litArgOption.map(_.forcedWidth)
 
-  private[chisel3] def litIsForcedWidth: Option[Boolean] = litArgOption match {
-    case Some(litArg) => Some(litArg.forcedWidth)
-    case _ => None
-  }
+  override def elementLitArg: Option[LitArg] = litArgOption
 
   // provide bits-specific literal handling functionality here
   override private[chisel3] def ref: Arg = topBindingOpt match {
@@ -773,11 +766,10 @@ sealed class Bool() extends UInt(1.W) with Reset {
     new Bool().asInstanceOf[this.type]
   }
 
-  def litToBooleanOption: Option[Boolean] = litToBigIntOption match {
-    case Some(intVal) if intVal == 1 => Some(true)
-    case Some(intVal) if intVal == 0 => Some(false)
-    case Some(intVal) => throwException(s"Boolean with unexpected literal value $intVal")
-    case None => None
+  def litToBooleanOption: Option[Boolean] = litToBigIntOption.map {
+    case intVal if intVal == 1 => true
+    case intVal if intVal == 0 => false
+    case intVal => throwException(s"Boolean with unexpected literal value $intVal")
   }
 
   def litToBoolean: Boolean = litToBooleanOption.get
@@ -861,11 +853,9 @@ sealed class FixedPoint private (width: Width, val binaryPoint: BinaryPoint)
     case _ => this badConnect that
   }
 
-  def litToDoubleOption: Option[Double] = litToBigIntOption match {
-    case Some(intVal) =>
-      val multiplier = math.pow(2, binaryPoint.get)
-      Some(intVal.toDouble / multiplier)
-    case _ => None
+  def litToDoubleOption: Option[Double] = litToBigIntOption.map { intVal =>
+    val multiplier = math.pow(2, binaryPoint.get)
+    intVal.toDouble / multiplier
   }
 
   def litToDouble: Double = litToDoubleOption.get
diff --git a/chiselFrontend/src/main/scala/chisel3/core/Data.scala b/chiselFrontend/src/main/scala/chisel3/core/Data.scala
index 7ff1ec0b..d3d94b21 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/Data.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/Data.scala
@@ -250,14 +250,9 @@ abstract class Data extends HasId with NamedComponent {
     _binding = Some(target)
   }
 
-  private[core] def topBindingOpt: Option[TopBinding] = {
-    _binding match {
-      case Some(binding) => binding match {
-        case ChildBinding(parent) => parent.topBindingOpt
-        case binding: TopBinding => Some(binding)
-      }
-      case None => None
-    }
+  private[core] def topBindingOpt: Option[TopBinding] = _binding.map {
+    case ChildBinding(parent) => parent.topBinding
+    case bindingVal: TopBinding => bindingVal
   }
 
   private[core] def topBinding: TopBinding = topBindingOpt.get
diff --git a/src/main/scala/chisel3/util/Conditional.scala b/src/main/scala/chisel3/util/Conditional.scala
index f558b7ba..1d2805ad 100644
--- a/src/main/scala/chisel3/util/Conditional.scala
+++ b/src/main/scala/chisel3/util/Conditional.scala
@@ -28,7 +28,7 @@ class SwitchContext[T <: Bits](cond: T, whenContext: Option[WhenContext], lits:
   def is(v: Iterable[T])(block: => Unit): SwitchContext[T] = {
     if (!v.isEmpty) {
       val newLits = v.map { w =>
-        require(w.litToBigIntOption != None, "is condition must be literal")
+        require(w.litToBigIntOption.isDefined, "is condition must be literal")
         val value = w.litToBigInt
         require(!lits.contains(value), "all is conditions must be mutually exclusive!")
         value