Fix Anonymous function convertible to a method value

if methods has parens, then referencing without parens
is a method value, you don't need following underscore

5 files changed, 6 insertions, 6 deletions

diff --git a/src/main/scala/firrtl/Annotations.scala b/src/main/scala/firrtl/Annotations.scala
index 173006ab..987501ec 100644
--- a/src/main/scala/firrtl/Annotations.scala
+++ b/src/main/scala/firrtl/Annotations.scala
@@ -163,7 +163,7 @@ object Annotations {
     def serialize: String = this.toString
     def update(tos: Seq[Named]): Seq[Annotation] = {
       check(target, tos, this)
-      propagate(target, tos, duplicate _)
+      propagate(target, tos, duplicate)
     }
   }
 
diff --git a/src/main/scala/firrtl/passes/InferWidths.scala b/src/main/scala/firrtl/passes/InferWidths.scala
index ebec4d80..1a8cc343 100644
--- a/src/main/scala/firrtl/passes/InferWidths.scala
+++ b/src/main/scala/firrtl/passes/InferWidths.scala
@@ -287,8 +287,8 @@ object InferWidths extends Pass {
             v <- h.get(w.name) if !v.isInstanceOf[VarWidth]
             result <- solve(v)
           } yield result
-        case (w: MaxWidth) => reduceOptions(forceNonEmpty(w.args.map(solve _), Some(BigInt(0))), max)
-        case (w: MinWidth) => reduceOptions(forceNonEmpty(w.args.map(solve _), None), min)
+        case (w: MaxWidth) => reduceOptions(forceNonEmpty(w.args.map(solve), Some(BigInt(0))), max)
+        case (w: MinWidth) => reduceOptions(forceNonEmpty(w.args.map(solve), None), min)
         case (w: PlusWidth) => map2(solve(w.arg1), solve(w.arg2), {_ + _})
         case (w: MinusWidth) => map2(solve(w.arg1), solve(w.arg2), {_ - _})
         case (w: ExpWidth) => map2(Some(BigInt(2)), solve(w.arg1), pow_minus_one)
diff --git a/src/main/scala/firrtl/passes/PadWidths.scala b/src/main/scala/firrtl/passes/PadWidths.scala
index e0a2e304..9f1d906c 100644
--- a/src/main/scala/firrtl/passes/PadWidths.scala
+++ b/src/main/scala/firrtl/passes/PadWidths.scala
@@ -39,7 +39,7 @@ object PadWidths extends Pass {
       case Lt | Leq | Gt | Geq | Eq | Neq | Not | And | Or | Xor |
            Add | Sub | Mul | Div | Rem | Shr =>
         // sensitive ops
-        e map fixup((e.args map (width(_)) foldLeft 0)(math.max(_, _)))
+        e map fixup((e.args map width _ foldLeft 0)(math.max))
       case Dshl =>
         // special case as args aren't all same width
         e copy (op = Dshlw, args = Seq(fixup(width(e.tpe))(e.args.head), e.args(1)))
diff --git a/src/main/scala/firrtl/passes/RemoveEmpty.scala b/src/main/scala/firrtl/passes/RemoveEmpty.scala
index 225e2222..3909eefd 100644
--- a/src/main/scala/firrtl/passes/RemoveEmpty.scala
+++ b/src/main/scala/firrtl/passes/RemoveEmpty.scala
@@ -13,5 +13,5 @@ object RemoveEmpty extends Pass {
       case m: ExtModule => m
     }
   }
-  def run(c: Circuit): Circuit = Circuit(c.info, c.modules.map(onModule _), c.main)
+  def run(c: Circuit): Circuit = Circuit(c.info, c.modules.map(onModule), c.main)
 }
diff --git a/src/main/scala/firrtl/passes/RemoveValidIf.scala b/src/main/scala/firrtl/passes/RemoveValidIf.scala
index e0a4b621..3b4daee2 100644
--- a/src/main/scala/firrtl/passes/RemoveValidIf.scala
+++ b/src/main/scala/firrtl/passes/RemoveValidIf.scala
@@ -23,5 +23,5 @@ object RemoveValidIf extends Pass {
       }
    }
 
-   def run(c: Circuit): Circuit = Circuit(c.info, c.modules.map(onModule _), c.main)
+   def run(c: Circuit): Circuit = Circuit(c.info, c.modules.map(onModule), c.main)
 }