From f00c35305652c12f13e60903a9434aa011ba4f4e Mon Sep 17 00:00:00 2001
From: Schuyler Eldridge
Date: Mon, 16 Dec 2019 16:26:07 -0500
Subject: {Firrtl, Circuit}Option should be Unserializable (#1278)

FirrtlOption and CircuitOption represent, respectively, something that
is convertible to FirrtlOptions or something that is convertible to a
FirrtlCircuitAnnotation. Neither of these is intended to be serialized
automatically in output JSON.

This has the effect of *not* JSON-serializing the
FirrtlCircuitAnnotation. This serialization is supposed to be to a
file via an emitter.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>---
 src/main/scala/firrtl/stage/FirrtlAnnotations.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/firrtl/stage/FirrtlAnnotations.scala b/src/main/scala/firrtl/stage/FirrtlAnnotations.scala
index 423f0bd1..aa3fed2b 100644
--- a/src/main/scala/firrtl/stage/FirrtlAnnotations.scala
+++ b/src/main/scala/firrtl/stage/FirrtlAnnotations.scala
@@ -5,7 +5,7 @@ package firrtl.stage
 import firrtl._
 import firrtl.ir.Circuit
 import firrtl.annotations.{Annotation, NoTargetAnnotation}
-import firrtl.options.{HasShellOptions, OptionsException, ShellOption}
+import firrtl.options.{HasShellOptions, OptionsException, ShellOption, Unserializable}
 
 
 import java.io.FileNotFoundException
@@ -14,12 +14,12 @@ import java.nio.file.NoSuchFileException
 /** Indicates that this is an [[firrtl.annotations.Annotation Annotation]] directly used in the construction of a
   * [[FirrtlOptions]] view.
   */
-sealed trait FirrtlOption { this: Annotation => }
+sealed trait FirrtlOption extends Unserializable { this: Annotation => }
 
 /** Indicates that this [[firrtl.annotations.Annotation Annotation]] contains information that is directly convertable
   * to a FIRRTL [[firrtl.ir.Circuit Circuit]].
   */
-sealed trait CircuitOption { this: Annotation =>
+sealed trait CircuitOption extends Unserializable { this: Annotation =>
 
   /** Convert this [[firrtl.annotations.Annotation Annotation]] to a [[FirrtlCircuitAnnotation]]
     */
-- 
cgit v1.2.3