From 51e736d71126b8c82ebc5c356a4b2900979a1279 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Tue, 23 Apr 2019 06:31:59 -0400 Subject: [PATCH 1/4] The procedure syntax is deprecated Instead, add `: Unit =` to explicitly declare return type. --- jvm/src/test/scala/scala/xml/XMLTest.scala | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jvm/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala index 11387171b..8266d9b18 100644 --- a/jvm/src/test/scala/scala/xml/XMLTest.scala +++ b/jvm/src/test/scala/scala/xml/XMLTest.scala @@ -820,55 +820,55 @@ class XMLTestJVM { } @UnitTest - def xTokenTest { + def xTokenTest: Unit = { val x = xml.parsing.ConstructingParser.fromSource(toSource("a"), false) assertEquals((): Unit, x.xToken('b')) } @UnitTest(expected = classOf[FatalError]) - def xCharDataFailure { + def xCharDataFailure: Unit = { val x = xml.parsing.ConstructingParser.fromSource(toSource(""), false) x.xCharData } @UnitTest(expected = classOf[FatalError]) - def xCommentFailure { + def xCommentFailure: Unit = { val x = xml.parsing.ConstructingParser.fromSource(toSource(""), false) x.xComment } @UnitTest - def xmlProcInstrTest { + def xmlProcInstrTest: Unit = { val x = xml.parsing.ConstructingParser.fromSource(toSource("aa"), false) assertEquals(new UnprefixedAttribute("aa", Text(""), Null), x.xmlProcInstr) } @UnitTest(expected = classOf[FatalError]) - def notationDeclFailure { + def notationDeclFailure: Unit = { val x = xml.parsing.ConstructingParser.fromSource(toSource(""), false) x.notationDecl } @UnitTest - def pubidLiteralTest { + def pubidLiteralTest: Unit = { val x = xml.parsing.ConstructingParser.fromSource(toSource(""), false) assertEquals("", x.pubidLiteral) } @UnitTest - def xAttributeValueTest { + def xAttributeValueTest: Unit = { val x = xml.parsing.ConstructingParser.fromSource(toSource("'"), false) assertEquals("", x.xAttributeValue) } @UnitTest - def xEntityValueTest { + def xEntityValueTest: Unit = { val x = xml.parsing.ConstructingParser.fromSource(toSource(""), false) assertEquals("", x.xEntityValue) From 58c563fe11dff150464197969155c49c0fffc4d6 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Tue, 23 Apr 2019 06:34:45 -0400 Subject: [PATCH 2/4] Method + in class Char is deprecated (since 2.13.0) Adding a number and a String is deprecated. Use the string interpolation `s"$num$str"` --- shared/src/main/scala/scala/xml/dtd/ExternalID.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/src/main/scala/scala/xml/dtd/ExternalID.scala b/shared/src/main/scala/scala/xml/dtd/ExternalID.scala index 1d546ca97..87356a1b1 100644 --- a/shared/src/main/scala/scala/xml/dtd/ExternalID.scala +++ b/shared/src/main/scala/scala/xml/dtd/ExternalID.scala @@ -18,7 +18,7 @@ package dtd sealed abstract class ExternalID extends parsing.TokenTests { def quoted(s: String) = { val c = if (s contains '"') '\'' else '"' - c + s + c + c.toString + s + c } // public != null: PUBLIC " " publicLiteral " " [systemLiteral] From e029ac15390dd130d60b72bd0225cd5e6c3c4bf7 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Tue, 23 Apr 2019 06:35:01 -0400 Subject: [PATCH 3/4] Passing an explicit array value to a varargs method This is deprecated (since 2.13.0) and will result in a defensive copy; Use the more efficient non-copying ArraySeq.unsafeWrapArray or an explicit toIndexedSeq call --- shared/src/main/scala/scala/xml/dtd/impl/DetWordAutom.scala | 2 +- shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/src/main/scala/scala/xml/dtd/impl/DetWordAutom.scala b/shared/src/main/scala/scala/xml/dtd/impl/DetWordAutom.scala index e44285c81..fe0b66c0e 100644 --- a/shared/src/main/scala/scala/xml/dtd/impl/DetWordAutom.scala +++ b/shared/src/main/scala/scala/xml/dtd/impl/DetWordAutom.scala @@ -34,7 +34,7 @@ private[dtd] abstract class DetWordAutom[T <: AnyRef] { val sb = new StringBuilder("[DetWordAutom nstates=") sb.append(nstates) sb.append(" finals=") - val map = Map(finals.zipWithIndex map (_.swap): _*) + val map = finals.zipWithIndex.map(_.swap).toMap sb.append(map.toString()) sb.append(" delta=\n") diff --git a/shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala b/shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala index 2fef5b9a8..7ec77ad56 100644 --- a/shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala +++ b/shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala @@ -144,7 +144,7 @@ private[dtd] abstract class WordBerrySethi extends BaseBerrySethi { if (x.isNullable) // initial state is final finals = finals.updated(0, finalTag) - val delta1 = immutable.Map(deltaq.zipWithIndex map (_.swap): _*) + val delta1 = deltaq.zipWithIndex.map(_.swap).toMap val finalsArr = (0 until pos map (k => finals.getOrElse(k, 0))).toArray // 0 == not final val deltaArr: Array[mutable.Map[_labelT, immutable.BitSet]] = From ec593f03ddc2d70ab2e3fb58e8bce051eb23a7b3 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Tue, 23 Apr 2019 06:35:10 -0400 Subject: [PATCH 4/4] Predef.tuple2ToZippedOps is deprecated use xs.lazyZip(ys) Will need to use xs.zip(ys) in scala-xml, instead. --- jvm/src/test/scala/scala/xml/ReuseNodesTest.scala | 2 +- .../src/main/scala/scala/xml/transform/BasicTransformer.scala | 2 +- .../xml/{PatternMatching.scala => PatternMatchingTest.scala} | 2 +- .../scala/xml/{Transformers.scala => TransformersTest.scala} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename shared/src/test/scala/scala/xml/{PatternMatching.scala => PatternMatchingTest.scala} (98%) rename shared/src/test/scala/scala/xml/{Transformers.scala => TransformersTest.scala} (98%) diff --git a/jvm/src/test/scala/scala/xml/ReuseNodesTest.scala b/jvm/src/test/scala/scala/xml/ReuseNodesTest.scala index f419a1de4..5d38d74e2 100644 --- a/jvm/src/test/scala/scala/xml/ReuseNodesTest.scala +++ b/jvm/src/test/scala/scala/xml/ReuseNodesTest.scala @@ -32,7 +32,7 @@ object ReuseNodesTest { override def transform(ns: Seq[Node]): Seq[Node] = { val changed = ns flatMap transform - if (changed.length != ns.length || (changed, ns).zipped.exists(_ != _)) changed + if (changed.length != ns.length || changed.zip(ns).exists(p => p._1 != p._2)) changed else ns } override def transform(n:Node): Seq[Node] = super.transform(n) diff --git a/shared/src/main/scala/scala/xml/transform/BasicTransformer.scala b/shared/src/main/scala/scala/xml/transform/BasicTransformer.scala index 02e333d7c..707468ab9 100644 --- a/shared/src/main/scala/scala/xml/transform/BasicTransformer.scala +++ b/shared/src/main/scala/scala/xml/transform/BasicTransformer.scala @@ -34,7 +34,7 @@ abstract class BasicTransformer extends Function1[Node, Node] { */ def transform(ns: Seq[Node]): Seq[Node] = { val changed = ns flatMap transform - if (changed.length != ns.length || (changed, ns).zipped.exists(_ != _)) changed + if (changed.length != ns.length || changed.zip(ns).exists(p => p._1 != p._2)) changed else ns } diff --git a/shared/src/test/scala/scala/xml/PatternMatching.scala b/shared/src/test/scala/scala/xml/PatternMatchingTest.scala similarity index 98% rename from shared/src/test/scala/scala/xml/PatternMatching.scala rename to shared/src/test/scala/scala/xml/PatternMatchingTest.scala index 32d4b9b78..6f241464a 100644 --- a/shared/src/test/scala/scala/xml/PatternMatching.scala +++ b/shared/src/test/scala/scala/xml/PatternMatchingTest.scala @@ -5,7 +5,7 @@ import org.junit.Test import org.junit.Assert.assertTrue import org.junit.Assert.assertEquals -class PatternMatching extends { +class PatternMatchingTest extends { @Test def unprefixedAttribute: Unit = { val li = List("1", "2", "3", "4") diff --git a/shared/src/test/scala/scala/xml/Transformers.scala b/shared/src/test/scala/scala/xml/TransformersTest.scala similarity index 98% rename from shared/src/test/scala/scala/xml/Transformers.scala rename to shared/src/test/scala/scala/xml/TransformersTest.scala index 146a480a3..59ca25240 100644 --- a/shared/src/test/scala/scala/xml/Transformers.scala +++ b/shared/src/test/scala/scala/xml/TransformersTest.scala @@ -6,7 +6,7 @@ import scala.xml.transform._ import org.junit.Test import org.junit.Assert.assertEquals -class Transformers { +class TransformersTest { def transformer = new RuleTransformer(new RewriteRule {