Scala: fix deprecated-usage warnings

scalameta · Nov 29, 2024 · 5261e85 · 5261e85
1 parent beaecf7
commit 5261e85
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/cli/src/main/scala/mdoc/PostModifier.scala b/cli/src/main/scala/mdoc/PostModifier.scala
@@ -23,7 +23,7 @@ object PostModifier {
     ServiceLoader.load(classOf[PostModifier], classLoader).iterator().asScala.toList
   implicit val surface: Surface[Settings] = new Surface(Nil)
   implicit val decoder: ConfDecoder[PostModifier] =
-    ConfDecoder.instanceF[PostModifier](_ => ConfError.message("unsupported").notOk)
+    ConfDecoder.from[PostModifier](_ => ConfError.message("unsupported").notOk)
   implicit val encoder: ConfEncoder[PostModifier] =
     ConfEncoder.StringEncoder.contramap(mod => s"<${mod.name}>")
 }

diff --git a/mdoc/src/main/scala-2/mdoc/internal/markdown/Instrumenter.scala b/mdoc/src/main/scala-2/mdoc/internal/markdown/Instrumenter.scala
@@ -188,9 +188,8 @@ object Instrumenter {
       pat.collect { case m: Member => m.name }
     def unapply(tree: Tree): Option[List[Name]] =
       tree match {
-        case Defn.Val(mods, _, _, _) if mods.exists(_.isInstanceOf[Lazy]) => Some(Nil)
-        case Defn.Val(_, pats, _, _) => Some(pats.flatMap(binders))
-        case Defn.Var(_, pats, _, _) => Some(pats.flatMap(binders))
+        case t: Defn.Val if t.mods.exists(_.isInstanceOf[Lazy]) => Some(Nil)
+        case t: Tree.WithPats with Defn => Some(t.pats.flatMap(binders))
         case _: Defn => Some(Nil)
         case _: Import => Some(Nil)
         case _ => None

diff --git a/mdoc/src/main/scala-3/mdoc/internal/markdown/Instrumenter.scala b/mdoc/src/main/scala-3/mdoc/internal/markdown/Instrumenter.scala
@@ -193,9 +193,8 @@ object Instrumenter {
       pat.collect { case m: Member => m.name }
     def unapply(tree: Tree): Option[List[Name]] =
       tree match {
-        case Defn.Val(mods, _, _, _) if mods.exists(_.isInstanceOf[Lazy]) => Some(Nil)
-        case Defn.Val(_, pats, _, _) => Some(pats.flatMap(binders))
-        case Defn.Var(_, pats, _, _) => Some(pats.flatMap(binders))
+        case t: Defn.Val if t.mods.exists(_.isInstanceOf[Lazy]) => Some(Nil)
+        case t: Tree.WithPats with Defn => Some(t.pats.flatMap(binders))
         case _: Defn => Some(Nil)
         case _: Import => Some(Nil)
         case _ => None

diff --git a/mdoc/src/main/scala/mdoc/internal/pos/PositionSyntax.scala b/mdoc/src/main/scala/mdoc/internal/pos/PositionSyntax.scala
@@ -52,8 +52,7 @@ object PositionSyntax extends CliEnrichments with CollectionEnrichments {
       mpos.toUnslicedPosition
     }
     def toOriginal(edit: TokenEditDistance): Position = {
-      val Right(x) = edit.toOriginal(pos.startLine, pos.startColumn)
-      x.toUnslicedPosition
+      edit.toOriginal(pos.startLine, pos.startColumn).toOption.get.toUnslicedPosition
     }
   }
   implicit class XtensionPositionMdoc2(pos: Position) {