Replace Mappers with Foreachers in several passes (#954)

1 files changed, 5 insertions, 7 deletions

diff --git a/src/main/scala/firrtl/analyses/InstanceGraph.scala b/src/main/scala/firrtl/analyses/InstanceGraph.scala
index 00689a51..c4a70c73 100644
--- a/src/main/scala/firrtl/analyses/InstanceGraph.scala
+++ b/src/main/scala/firrtl/analyses/InstanceGraph.scala
@@ -7,7 +7,7 @@ import firrtl._
 import firrtl.ir._
 import firrtl.graph._
 import firrtl.Utils._
-import firrtl.Mappers._
+import firrtl.traversals.Foreachers._
 import firrtl.annotations.TargetToken.{Instance, OfModule}
 
 
@@ -24,7 +24,7 @@ class InstanceGraph(c: Circuit) {
     new mutable.LinkedHashMap[String, mutable.LinkedHashSet[WDefInstance]]
   for (m <- c.modules) {
     childInstances(m.name) = new mutable.LinkedHashSet[WDefInstance]
-    m map InstanceGraph.collectInstances(childInstances(m.name))
+    m.foreach(InstanceGraph.collectInstances(childInstances(m.name)))
     instantiated ++= childInstances(m.name).map(i => i.module)
   }
 
@@ -117,12 +117,10 @@ object InstanceGraph {
     * @return
     */
   def collectInstances(insts: mutable.Set[WDefInstance])
-                      (s: Statement): Statement = s match {
-    case i: WDefInstance =>
-      insts += i
-      i
+                      (s: Statement): Unit = s match {
+    case i: WDefInstance => insts += i
     case i: DefInstance => throwInternalError("Expecting WDefInstance, found a DefInstance!")
     case i: WDefInstanceConnector => throwInternalError("Expecting WDefInstance, found a WDefInstanceConnector!")
-    case _ => s map collectInstances(insts)
+    case _ => s.foreach(collectInstances(insts))
   }
 }