From db6a6dce09ce2eb1c6c6c0c1c5ec3c881f4c3d77 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Tue, 29 Oct 2019 21:01:09 -0700 Subject: Some cleanup --- src/main/scala/firrtl/annotations/JsonProtocol.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/scala/firrtl/annotations/JsonProtocol.scala b/src/main/scala/firrtl/annotations/JsonProtocol.scala index 92cf4264..4fb40b76 100644 --- a/src/main/scala/firrtl/annotations/JsonProtocol.scala +++ b/src/main/scala/firrtl/annotations/JsonProtocol.scala @@ -10,7 +10,7 @@ import org.json4s.native.Serialization import org.json4s.native.Serialization.{read, writePretty} trait HasSerializationHints { - // For serialization of complicated constuctor arguments, let the annotation + // For serialization of complicated constructor arguments, let the annotation // writer specify additional type hints for relevant classes that might be // contained within def typeHints: Seq[Class[_]] @@ -93,10 +93,10 @@ object JsonProtocol { def serialize(annos: Seq[Annotation]): String = serializeTry(annos).get def serializeTry(annos: Seq[Annotation]): Try[String] = { - val tags = annos.collect({ + val tags = annos.flatMap({ case anno: HasSerializationHints => anno.getClass +: anno.typeHints case anno => Seq(anno.getClass) - }).flatten.distinct + }).distinct implicit val formats = jsonFormat(tags) Try(writePretty(annos)) -- cgit v1.2.3