Addresses #459. Rewords transform annotations API.

Now, any annotation not propagated by a transform is considered deleted.
A new DeletedAnnotation is added in place of it.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/main/scala/firrtl/transforms/BlackBoxSourceHelper.scala b/src/main/scala/firrtl/transforms/BlackBoxSourceHelper.scala
index aaae284b..9fff30fe 100644
--- a/src/main/scala/firrtl/transforms/BlackBoxSourceHelper.scala
+++ b/src/main/scala/firrtl/transforms/BlackBoxSourceHelper.scala
@@ -122,7 +122,7 @@ class BlackBoxSourceHelper extends firrtl.Transform {
       writer.close()
     }
 
-    CircuitState(resultState.circuit, resultState.form)
+    resultState
   }
 }
 
diff --git a/src/main/scala/firrtl/transforms/Dedup.scala b/src/main/scala/firrtl/transforms/Dedup.scala
index 0ca471af..5fa2c036 100644
--- a/src/main/scala/firrtl/transforms/Dedup.scala
+++ b/src/main/scala/firrtl/transforms/Dedup.scala
@@ -32,10 +32,10 @@ class DedupModules extends Transform {
   def outputForm = HighForm
   def execute(state: CircuitState): CircuitState = {
     getMyAnnotations(state) match {
-      case Nil => CircuitState(run(state.circuit, Seq.empty), state.form)
+      case Nil => state.copy(circuit = run(state.circuit, Seq.empty))
       case annos =>
         val noDedups = annos.collect { case NoDedupAnnotation(ModuleName(m, c)) => m }
-        CircuitState(run(state.circuit, noDedups), state.form)
+        state.copy(circuit = run(state.circuit, noDedups))
     }
   }
   // Orders the modules of a circuit from leaves to root