All of src/ formatted with scalafmt

1 files changed, 22 insertions, 23 deletions

diff --git a/src/main/scala/firrtl/Mappers.scala b/src/main/scala/firrtl/Mappers.scala
index 3bf89885..e9a698ae 100644
--- a/src/main/scala/firrtl/Mappers.scala
+++ b/src/main/scala/firrtl/Mappers.scala
@@ -12,36 +12,35 @@ object Mappers {
   }
   private object PortMagnet {
     implicit def forType(f: Type => Type): PortMagnet = new PortMagnet {
-      override def map(port: Port): Port = port mapType f
+      override def map(port: Port): Port = port.mapType(f)
     }
     implicit def forString(f: String => String): PortMagnet = new PortMagnet {
-      override def map(port: Port): Port = port mapString f
+      override def map(port: Port): Port = port.mapString(f)
     }
   }
   implicit class PortMap(val _port: Port) extends AnyVal {
     def map[T](f: T => T)(implicit magnet: (T => T) => PortMagnet): Port = magnet(f).map(_port)
   }
 
-
   // ********** Stmt Mappers **********
   private trait StmtMagnet {
     def map(stmt: Statement): Statement
   }
   private object StmtMagnet {
     implicit def forStmt(f: Statement => Statement): StmtMagnet = new StmtMagnet {
-      override def map(stmt: Statement): Statement = stmt mapStmt f
+      override def map(stmt: Statement): Statement = stmt.mapStmt(f)
     }
     implicit def forExp(f: Expression => Expression): StmtMagnet = new StmtMagnet {
-      override def map(stmt: Statement): Statement = stmt mapExpr f
+      override def map(stmt: Statement): Statement = stmt.mapExpr(f)
     }
     implicit def forType(f: Type => Type): StmtMagnet = new StmtMagnet {
-      override def map(stmt: Statement) : Statement = stmt mapType f
+      override def map(stmt: Statement): Statement = stmt.mapType(f)
     }
     implicit def forString(f: String => String): StmtMagnet = new StmtMagnet {
-      override def map(stmt: Statement): Statement = stmt mapString f
+      override def map(stmt: Statement): Statement = stmt.mapString(f)
     }
     implicit def forInfo(f: Info => Info): StmtMagnet = new StmtMagnet {
-      override def map(stmt: Statement): Statement = stmt mapInfo f
+      override def map(stmt: Statement): Statement = stmt.mapInfo(f)
     }
   }
   implicit class StmtMap(val _stmt: Statement) extends AnyVal {
@@ -55,13 +54,13 @@ object Mappers {
   }
   private object ExprMagnet {
     implicit def forExpr(f: Expression => Expression): ExprMagnet = new ExprMagnet {
-      override def map(expr: Expression): Expression = expr mapExpr f
+      override def map(expr: Expression): Expression = expr.mapExpr(f)
     }
     implicit def forType(f: Type => Type): ExprMagnet = new ExprMagnet {
-      override def map(expr: Expression): Expression = expr mapType f
+      override def map(expr: Expression): Expression = expr.mapType(f)
     }
     implicit def forWidth(f: Width => Width): ExprMagnet = new ExprMagnet {
-      override def map(expr: Expression): Expression = expr mapWidth f
+      override def map(expr: Expression): Expression = expr.mapWidth(f)
     }
   }
   implicit class ExprMap(val _expr: Expression) extends AnyVal {
@@ -74,10 +73,10 @@ object Mappers {
   }
   private object TypeMagnet {
     implicit def forType(f: Type => Type): TypeMagnet = new TypeMagnet {
-      override def map(tpe: Type): Type = tpe mapType f
+      override def map(tpe: Type): Type = tpe.mapType(f)
     }
     implicit def forWidth(f: Width => Width): TypeMagnet = new TypeMagnet {
-      override def map(tpe: Type): Type = tpe mapWidth f
+      override def map(tpe: Type): Type = tpe.mapWidth(f)
     }
   }
   implicit class TypeMap(val _tpe: Type) extends AnyVal {
@@ -91,7 +90,7 @@ object Mappers {
   private object WidthMagnet {
     implicit def forWidth(f: Width => Width): WidthMagnet = new WidthMagnet {
       override def map(width: Width): Width = width match {
-        case mapable: HasMapWidth => mapable mapWidth f // WIR
+        case mapable: HasMapWidth => mapable.mapWidth(f) // WIR
         case other => other // Standard IR nodes
       }
     }
@@ -106,21 +105,21 @@ object Mappers {
   }
   private object ModuleMagnet {
     implicit def forStmt(f: Statement => Statement): ModuleMagnet = new ModuleMagnet {
-      override def map(module: DefModule): DefModule = module mapStmt f
+      override def map(module: DefModule): DefModule = module.mapStmt(f)
     }
     implicit def forPorts(f: Port => Port): ModuleMagnet = new ModuleMagnet {
-      override def map(module: DefModule): DefModule = module mapPort f
+      override def map(module: DefModule): DefModule = module.mapPort(f)
     }
     implicit def forString(f: String => String): ModuleMagnet = new ModuleMagnet {
-      override def map(module: DefModule): DefModule = module mapString f
+      override def map(module: DefModule): DefModule = module.mapString(f)
     }
     implicit def forInfo(f: Info => Info): ModuleMagnet = new ModuleMagnet {
-      override def map(module: DefModule): DefModule = module mapInfo f
+      override def map(module: DefModule): DefModule = module.mapInfo(f)
     }
   }
   implicit class ModuleMap(val _module: DefModule) extends AnyVal {
     def map[T](f: T => T)(implicit magnet: (T => T) => ModuleMagnet): DefModule = magnet(f).map(_module)
-  } 
+  }
 
   // ********** Circuit Mappers **********
   private trait CircuitMagnet {
@@ -128,16 +127,16 @@ object Mappers {
   }
   private object CircuitMagnet {
     implicit def forModules(f: DefModule => DefModule): CircuitMagnet = new CircuitMagnet {
-      override def map(circuit: Circuit): Circuit = circuit mapModule f
+      override def map(circuit: Circuit): Circuit = circuit.mapModule(f)
     }
     implicit def forString(f: String => String): CircuitMagnet = new CircuitMagnet {
-      override def map(circuit: Circuit): Circuit = circuit mapString f
+      override def map(circuit: Circuit): Circuit = circuit.mapString(f)
     }
     implicit def forInfo(f: Info => Info): CircuitMagnet = new CircuitMagnet {
-      override def map(circuit: Circuit): Circuit = circuit mapInfo f
+      override def map(circuit: Circuit): Circuit = circuit.mapInfo(f)
     }
   }
   implicit class CircuitMap(val _circuit: Circuit) extends AnyVal {
     def map[T](f: T => T)(implicit magnet: (T => T) => CircuitMagnet): Circuit = magnet(f).map(_circuit)
-  } 
+  }
 }