resolve some deprecations

utwente-fmt · Oct 4, 2023 · b17b99a · b17b99a
1 parent 20dedd3
commit b17b99a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/colhelper/ColDefs.scala b/src/colhelper/ColDefs.scala
@@ -1,4 +1,3 @@
-import scala.collection.mutable
 import scala.meta._
 
 /**
@@ -45,9 +44,9 @@ object ColDefs {
   )
 
   def scopes(kind: String): Term.Name =
-    Term.Name(kind.charAt(0).toLower + kind.substring(1) + "s")
+    Term.Name(kind.charAt(0).toLower.toString + kind.substring(1) + "s")
 
-  val DECLARATION_NAMESPACE: mutable.ListMap[String, Seq[String]] = mutable.ListMap(
+  val DECLARATION_NAMESPACE: Map[String, Seq[String]] = Map(
     "GlobalDeclaration" -> Seq("Program"),
     "ClassDeclaration" -> Seq("Program"),
     "ADTDeclaration" -> Seq("Program"),

diff --git a/src/colhelper/ColDescription.scala b/src/colhelper/ColDescription.scala
@@ -2,7 +2,7 @@ import ColDefs._
 
 import java.io.File
 import java.nio.file.Files
-import scala.collection.mutable
+import scala.collection.immutable.ListMap
 import scala.collection.mutable.ArrayBuffer
 import scala.meta._
 
@@ -66,7 +66,7 @@ case class ClassDef(names: Seq[String], params: List[Term.Param], blameType: Opt
 
 class ColDescription {
   val defs: ArrayBuffer[ClassDef] = ArrayBuffer()
-  val bases: mutable.ListMap[String, List[String]] = mutable.ListMap()
+  var bases: ListMap[String, List[String]] = ListMap()
   val families: ArrayBuffer[String] = ArrayBuffer()
 
   def supports(baseType: String)(cls: String): Boolean = {
@@ -193,12 +193,12 @@ class ColDescription {
    */
   def collectBases(stat: Stat): Unit = stat match {
     case Defn.Class(_, name, _, _, Template(_, inits, _, _)) =>
-      bases(name.value) = inits.collect {
+      bases += name.value -> inits.collect {
         case Init(Type.Name(name), _, _) => name
         case Init(Type.Apply(Type.Name(name), _), _, _) => name
       }
     case Defn.Trait(_, name, _, _, Template(_, inits, _, _)) =>
-      bases(name.value) = inits.collect {
+      bases += name.value -> inits.collect {
         case Init(Type.Name(name), _, _) => name
         case Init(Type.Apply(Type.Name(name), _), _, _) => name
       }

diff --git a/src/colhelper/ColHelper.scala b/src/colhelper/ColHelper.scala
@@ -8,7 +8,7 @@ import scala.meta.prettyprinters.Show
 object ColHelper {
   def main(args: Array[String]): Unit =
     ColHelper().generate(
-      args.tail.map(new File(_)),
+      args.toSeq.tail.map(new File(_)),
       new File(args.head),
       (f, data) => {
         new File(f.getParent).mkdirs()

diff --git a/test/main/vct/test/integration/helper/ExampleFiles.scala b/test/main/vct/test/integration/helper/ExampleFiles.scala
@@ -42,7 +42,7 @@ case object ExampleFiles {
 
   def find(directory: File): Seq[File] =
     Option(directory.listFiles()) match {
-      case Some(files) => files.filterNot(f => EXCLUSIONS.exists(_(f))).sortBy(_.getName).flatMap(f => if(f.isDirectory) find(f) else Seq(f))
+      case Some(files) => files.toSeq.filterNot(f => EXCLUSIONS.exists(_(f))).sortBy(_.getName).flatMap(f => if(f.isDirectory) find(f) else Seq(f))
       case None => Nil
     }
 }