From a5eecfee7b29e02a27c7f38b41c28bd666f8306a Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 31 Dec 2023 08:40:39 +0900 Subject: [PATCH] use new wildcard syntax --- jvm/src/test/scala/scala/xml/XMLTest.scala | 2 +- shared/src/main/scala/scala/xml/Atom.scala | 4 ++-- shared/src/main/scala/scala/xml/Equality.scala | 2 +- shared/src/main/scala/scala/xml/Node.scala | 2 +- shared/src/main/scala/scala/xml/NodeBuffer.scala | 6 +++--- shared/src/main/scala/scala/xml/PrettyPrinter.scala | 4 ++-- shared/src/test/scala/scala/xml/PatternMatchingTest.scala | 2 +- shared/src/test/scala/scala/xml/XMLTest.scala | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jvm/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala index a978e4bf..5bad0fb3 100644 --- a/jvm/src/test/scala/scala/xml/XMLTest.scala +++ b/jvm/src/test/scala/scala/xml/XMLTest.scala @@ -393,7 +393,7 @@ class XMLTestJVM { @UnitTest def t5115(): Unit = { - def assertHonorsIterableContract(i: Iterable[_]): Unit = assertEquals(i.size.toLong, i.iterator.size.toLong) + def assertHonorsIterableContract(i: Iterable[?]): Unit = assertEquals(i.size.toLong, i.iterator.size.toLong) assertHonorsIterableContract(.attributes) assertHonorsIterableContract(.attributes) diff --git a/shared/src/main/scala/scala/xml/Atom.scala b/shared/src/main/scala/scala/xml/Atom.scala index d2e1c23d..b6aa2fb5 100644 --- a/shared/src/main/scala/scala/xml/Atom.scala +++ b/shared/src/main/scala/scala/xml/Atom.scala @@ -29,12 +29,12 @@ class Atom[+A](val data: A) extends SpecialNode with Serializable { override protected def basisForHashCode: Seq[Any] = Seq(data) override def strict_==(other: Equality): Boolean = other match { - case x: Atom[_] => data == x.data + case x: Atom[?] => data == x.data case _ => false } override def canEqual(other: Any): Boolean = other match { - case _: Atom[_] => true + case _: Atom[?] => true case _ => false } diff --git a/shared/src/main/scala/scala/xml/Equality.scala b/shared/src/main/scala/scala/xml/Equality.scala index 3b48b282..d7d612d4 100644 --- a/shared/src/main/scala/scala/xml/Equality.scala +++ b/shared/src/main/scala/scala/xml/Equality.scala @@ -53,7 +53,7 @@ object Equality { * Note - these functions assume strict equality has already failed. */ def compareBlithely(x1: AnyRef, x2: String): Boolean = x1 match { - case x: Atom[_] => x.data == x2 + case x: Atom[?] => x.data == x2 case x: NodeSeq => x.text == x2 case _ => false } diff --git a/shared/src/main/scala/scala/xml/Node.scala b/shared/src/main/scala/scala/xml/Node.scala index f5337eee..ca1d6379 100755 --- a/shared/src/main/scala/scala/xml/Node.scala +++ b/shared/src/main/scala/scala/xml/Node.scala @@ -56,7 +56,7 @@ abstract class Node extends NodeSeq { /** * used internally. Atom/Molecule = -1 PI = -2 Comment = -3 EntityRef = -5 */ - def isAtom: Boolean = this.isInstanceOf[Atom[_]] + def isAtom: Boolean = this.isInstanceOf[Atom[?]] /** The logic formerly found in typeTag$, as best I could infer it. */ def doCollectNamespaces: Boolean = true // if (tag >= 0) DO collect namespaces diff --git a/shared/src/main/scala/scala/xml/NodeBuffer.scala b/shared/src/main/scala/scala/xml/NodeBuffer.scala index c6364226..af086ec2 100644 --- a/shared/src/main/scala/scala/xml/NodeBuffer.scala +++ b/shared/src/main/scala/scala/xml/NodeBuffer.scala @@ -39,10 +39,10 @@ class NodeBuffer extends scala.collection.mutable.ArrayBuffer[Node] with ScalaVe def &+(o: Any): NodeBuffer = { o match { case null | _: Unit | Text("") => // ignore - case it: Iterator[_] => it.foreach(&+) + case it: Iterator[?] => it.foreach(&+) case n: Node => super.+=(n) - case ns: Iterable[_] => this &+ ns.iterator - case ns: Array[_] => this &+ ns.iterator + case ns: Iterable[?] => this &+ ns.iterator + case ns: Array[?] => this &+ ns.iterator case d => super.+=(new Atom(d)) } this diff --git a/shared/src/main/scala/scala/xml/PrettyPrinter.scala b/shared/src/main/scala/scala/xml/PrettyPrinter.scala index e1e35c3c..f7fe7619 100755 --- a/shared/src/main/scala/scala/xml/PrettyPrinter.scala +++ b/shared/src/main/scala/scala/xml/PrettyPrinter.scala @@ -136,7 +136,7 @@ class PrettyPrinter(width: Int, step: Int, minimizeEmpty: Boolean) { protected def childrenAreLeaves(n: Node): Boolean = { def isLeaf(l: Node): Boolean = l match { - case _: Atom[_] | _: Comment | _: EntityRef | _: ProcInstr => true + case _: Atom[?] | _: Comment | _: EntityRef | _: ProcInstr => true case _ => false } n.child.forall(isLeaf) @@ -152,7 +152,7 @@ class PrettyPrinter(width: Int, step: Int, minimizeEmpty: Boolean) { case Text(s) if s.trim.isEmpty => - case _: Atom[_] | _: Comment | _: EntityRef | _: ProcInstr => + case _: Atom[?] | _: Comment | _: EntityRef | _: ProcInstr => makeBox(ind, node.toString.trim) case Group(xs) => traverse(xs.iterator, pscope, ind) diff --git a/shared/src/test/scala/scala/xml/PatternMatchingTest.scala b/shared/src/test/scala/scala/xml/PatternMatchingTest.scala index 829180e6..96890e81 100644 --- a/shared/src/test/scala/scala/xml/PatternMatchingTest.scala +++ b/shared/src/test/scala/scala/xml/PatternMatchingTest.scala @@ -57,7 +57,7 @@ class PatternMatchingTest { object SafeNodeSeq { def unapplySeq(any: Any): Option[Seq[Node]] = any match { - case s: Seq[_] => Some(s.flatMap { + case s: Seq[?] => Some(s.flatMap { case n: Node => n case _ => NodeSeq.Empty }) diff --git a/shared/src/test/scala/scala/xml/XMLTest.scala b/shared/src/test/scala/scala/xml/XMLTest.scala index 2b1c553a..989ca02e 100644 --- a/shared/src/test/scala/scala/xml/XMLTest.scala +++ b/shared/src/test/scala/scala/xml/XMLTest.scala @@ -408,7 +408,7 @@ Ours is the portal of hope, come as you are." @UnitTest def t5115(): Unit = { - def assertHonorsIterableContract(i: Iterable[_]): Unit = assertEquals(i.size.toLong, i.iterator.size.toLong) + def assertHonorsIterableContract(i: Iterable[?]): Unit = assertEquals(i.size.toLong, i.iterator.size.toLong) assertHonorsIterableContract(.attributes) assertHonorsIterableContract(.attributes)