Add Scala3 support

5 files changed, 8 insertions, 5 deletions

diff --git a/src/main/scala/firrtl/options/phases/AddDefaults.scala b/src/main/scala/firrtl/options/phases/AddDefaults.scala
index dcd5b031..626410fd 100644
--- a/src/main/scala/firrtl/options/phases/AddDefaults.scala
+++ b/src/main/scala/firrtl/options/phases/AddDefaults.scala
@@ -3,6 +3,7 @@
 package firrtl.options.phases
 
 import firrtl.AnnotationSeq
+import firrtl.{seqToAnnoSeq, annoSeqToSeq}
 import firrtl.options.{Dependency, Phase, TargetDirAnnotation}
 
 /** Add default annotations for a [[Stage]]
diff --git a/src/main/scala/firrtl/options/phases/Checks.scala b/src/main/scala/firrtl/options/phases/Checks.scala
index 64d81fb4..4ffe0510 100644
--- a/src/main/scala/firrtl/options/phases/Checks.scala
+++ b/src/main/scala/firrtl/options/phases/Checks.scala
@@ -4,6 +4,7 @@ package firrtl.options.phases
 
 import firrtl.AnnotationSeq
 import firrtl.annotations.Annotation
+import firrtl.{seqToAnnoSeq, annoSeqToSeq}
 import firrtl.options.{OptionsException, OutputAnnotationFileAnnotation, Phase, TargetDirAnnotation}
 import firrtl.options.Dependency
 
diff --git a/src/main/scala/firrtl/options/phases/DeletedWrapper.scala b/src/main/scala/firrtl/options/phases/DeletedWrapper.scala
index fe2c6d78..2b2ccf16 100644
--- a/src/main/scala/firrtl/options/phases/DeletedWrapper.scala
+++ b/src/main/scala/firrtl/options/phases/DeletedWrapper.scala
@@ -3,6 +3,7 @@
 package firrtl.options.phases
 
 import firrtl.AnnotationSeq
+import firrtl.{annoSeqToSeq, seqToAnnoSeq}
 import firrtl.annotations.DeletedAnnotation
 import firrtl.options.{Phase, Translator}
 
@@ -25,14 +26,10 @@ class DeletedWrapper(p: Phase) extends Phase with Translator[AnnotationSeq, (Ann
   def aToB(a: AnnotationSeq): (AnnotationSeq, AnnotationSeq) = (a, a)
 
   def bToA(b: (AnnotationSeq, AnnotationSeq)): AnnotationSeq = {
-
-    val (in, out) = (mutable.LinkedHashSet() ++ b._1, mutable.LinkedHashSet() ++ b._2)
-
-    (in -- out).map {
+    b._1.diff(b._2).map {
       case DeletedAnnotation(n, a) => DeletedAnnotation(s"$n+$name", a)
       case a                       => DeletedAnnotation(name, a)
     }.toSeq ++ b._2
-
   }
 
   def internalTransform(b: (AnnotationSeq, AnnotationSeq)): (AnnotationSeq, AnnotationSeq) = (b._1, p.transform(b._2))
diff --git a/src/main/scala/firrtl/options/phases/GetIncludes.scala b/src/main/scala/firrtl/options/phases/GetIncludes.scala
index d50b2c6f..05810a31 100644
--- a/src/main/scala/firrtl/options/phases/GetIncludes.scala
+++ b/src/main/scala/firrtl/options/phases/GetIncludes.scala
@@ -3,9 +3,11 @@
 package firrtl.options.phases
 
 import firrtl.AnnotationSeq
+import org.json4s.convertToJsonInput
 import firrtl.annotations.{AnnotationFileNotFoundException, JsonProtocol}
 import firrtl.options.{InputAnnotationFileAnnotation, Phase, StageUtils}
 import firrtl.FileUtils
+import firrtl.{seqToAnnoSeq, annoSeqToSeq}
 import firrtl.stage.AllowUnrecognizedAnnotations
 
 import java.io.File
diff --git a/src/main/scala/firrtl/options/phases/WriteOutputAnnotations.scala b/src/main/scala/firrtl/options/phases/WriteOutputAnnotations.scala
index ba38bb87..4cbb0496 100644
--- a/src/main/scala/firrtl/options/phases/WriteOutputAnnotations.scala
+++ b/src/main/scala/firrtl/options/phases/WriteOutputAnnotations.scala
@@ -3,6 +3,8 @@
 package firrtl.options.phases
 
 import firrtl.AnnotationSeq
+import firrtl.{seqToAnnoSeq, annoSeqToSeq}
+import firrtl.options.StageOptionsView
 import firrtl.annotations.{Annotation, DeletedAnnotation, JsonProtocol}
 import firrtl.options.{
   BufferedCustomFileEmission,