Skip to content

Commit 562ea83

Browse files
lrytzashawley
authored andcommitted
Seq => collection.Seq
Preserve for binary compatability. Scala 2.13 collections rewrite defaults to immutable.Seq.
1 parent 1b951af commit 562ea83

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+62
-0
lines changed

jvm/src/test/scala/scala/xml/ReuseNodesTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package scala.xml
22

33
import scala.xml.transform._
4+
import scala.collection.Seq
45
import org.junit.Assert.assertSame
56
import org.junit.experimental.theories.Theories
67
import org.junit.experimental.theories.Theory

jvm/src/test/scala/scala/xml/SerializationTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package scala.xml
22

3+
import scala.collection.Seq
34
import org.junit.Assert.assertEquals
45
import org.junit.Test
56

jvm/src/test/scala/scala/xml/XMLTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import java.io.StringWriter
1111
import java.io.ByteArrayOutputStream
1212
import java.io.StringReader
1313
import scala.collection.Iterable
14+
import scala.collection.Seq
1415
import scala.xml.Utility.sort
1516

1617
object XMLTestJVM {

shared/src/main/scala/scala/xml/Atom.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
13+
1214
/**
1315
* The class `Atom` provides an XML node for text (`PCDATA`).
1416
* It is used in both non-bound and bound XML representations.

shared/src/main/scala/scala/xml/Attribute.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
13+
1214
/**
1315
* This singleton object contains the `apply` and `unapply` methods for
1416
* convenient construction and deconstruction.

shared/src/main/scala/scala/xml/Document.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
13+
1214
/**
1315
* A document information item (according to InfoSet spec). The comments
1416
* are copied from the Infoset spec, only augmented with some information

shared/src/main/scala/scala/xml/Elem.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
package scala
1212
package xml
1313

14+
import scala.collection.Seq
15+
1416
/**
1517
* This singleton object contains the `apply` and `unapplySeq` methods for
1618
* convenient construction and deconstruction. It is possible to deconstruct

shared/src/main/scala/scala/xml/Equality.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
13+
1214
/**
1315
* In an attempt to contain the damage being inflicted on consistency by the
1416
* ad hoc `equals` methods spread around `xml`, the logic is centralized and

shared/src/main/scala/scala/xml/Group.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
13+
1214
/**
1315
* A hack to group XML nodes in one node for output.
1416
*

shared/src/main/scala/scala/xml/MetaData.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ package xml
1414
import Utility.sbToString
1515
import scala.annotation.tailrec
1616
import scala.collection.AbstractIterable
17+
import scala.collection.Seq
1718

1819
object MetaData {
1920
/**

shared/src/main/scala/scala/xml/NamespaceBinding.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
1213
import Utility.sbToString
1314

1415
/**

shared/src/main/scala/scala/xml/Node.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
13+
1214
/**
1315
* This singleton object contains the `unapplySeq` method for
1416
* convenient deconstruction.

shared/src/main/scala/scala/xml/NodeSeq.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import scala.collection.{ mutable, immutable, generic, SeqLike, AbstractSeq }
1313
import mutable.{ Builder, ListBuffer }
1414
import generic.{ CanBuildFrom }
1515
import scala.language.implicitConversions
16+
import scala.collection.Seq
1617

1718
/**
1819
* This object ...

shared/src/main/scala/scala/xml/Null.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package xml
1111

1212
import Utility.isNameStart
1313
import scala.collection.Iterator
14+
import scala.collection.Seq
1415

1516
/**
1617
* Essentially, every method in here is a dummy, returning Zero[T].

shared/src/main/scala/scala/xml/PrefixedAttribute.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
13+
1214
/**
1315
* prefixed attributes always have a non-null namespace.
1416
*

shared/src/main/scala/scala/xml/PrettyPrinter.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
1213
import Utility.sbToString
1314

1415
/**

shared/src/main/scala/scala/xml/TextBuffer.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
1213
import Utility.isSpace
1314

1415
object TextBuffer {

shared/src/main/scala/scala/xml/UnprefixedAttribute.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
package scala
1010
package xml
1111

12+
import scala.collection.Seq
13+
1214
/**
1315
* Unprefixed attributes have the null namespace, and no prefix field
1416
*

shared/src/main/scala/scala/xml/Utility.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package xml
1111

1212
import scala.collection.mutable
1313
import scala.language.implicitConversions
14+
import scala.collection.Seq
1415

1516
/**
1617
* The `Utility` object provides utility functions for processing instances

shared/src/main/scala/scala/xml/Xhtml.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package xml
44

55
import parsing.XhtmlEntities
66
import Utility.{ sbToString, isAtomAndNotText }
7+
import scala.collection.Seq
78

89
/* (c) David Pollak 2007 WorldWide Conferencing, LLC */
910

shared/src/main/scala/scala/xml/dtd/ContentModel.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package scala
1010
package xml
1111
package dtd
1212

13+
import scala.collection.Seq
1314
import scala.xml.dtd.impl._
1415
import scala.xml.Utility.sbToString
1516
import PartialFunction._

shared/src/main/scala/scala/xml/dtd/DTD.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package xml
1111
package dtd
1212

1313
import scala.collection.mutable
14+
import scala.collection.Seq
1415

1516
/**
1617
* A document type declaration.

shared/src/main/scala/scala/xml/dtd/DocType.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ package scala
1010
package xml
1111
package dtd
1212

13+
import scala.collection.Seq
14+
1315
/**
1416
* An XML node for document type declaration.
1517
*

shared/src/main/scala/scala/xml/dtd/ElementValidator.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ package dtd
1212

1313
import PartialFunction._
1414
import scala.collection.mutable
15+
import scala.collection.Seq
1516

1617
import ContentModel.ElemName
1718
import MakeValidationException._ // @todo other exceptions

shared/src/main/scala/scala/xml/dtd/Scanner.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ package scala
1010
package xml
1111
package dtd
1212

13+
import scala.collection.Seq
14+
1315
/**
1416
* Scanner for regexps (content models in DTD element declarations)
1517
* todo: cleanup

shared/src/main/scala/scala/xml/dtd/impl/BaseBerrySethi.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package scala
1010
package xml.dtd.impl
1111

1212
import scala.collection.{ mutable, immutable }
13+
import scala.collection.Seq
1314

1415
// todo: replace global variable pos with acc
1516

shared/src/main/scala/scala/xml/dtd/impl/Inclusion.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
package scala
1010
package xml.dtd.impl
1111

12+
import scala.collection.Seq
13+
1214
/**
1315
* A fast test of language inclusion between minimal automata.
1416
* inspired by the ''AMoRE automata library''.

shared/src/main/scala/scala/xml/dtd/impl/NondetWordAutom.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package scala
1010
package xml.dtd.impl
1111

1212
import scala.collection.{ immutable, mutable }
13+
import scala.collection.Seq
1314

1415
/**
1516
* A nondeterministic automaton. States are integers, where

shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package scala
1010
package xml.dtd.impl
1111

1212
import scala.collection.{ immutable, mutable }
13+
import scala.collection.Seq
1314

1415
/**
1516
* This class turns a regular expression into a [[scala.util.automata.NondetWordAutom]]

shared/src/main/scala/scala/xml/factory/LoggedNodeFactory.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ package scala
1010
package xml
1111
package factory
1212

13+
import scala.collection.Seq
14+
1315
/**
1416
* This class logs what the nodefactory is actually doing.
1517
* If you want to see what happens during loading, use it like this:

shared/src/main/scala/scala/xml/factory/NodeFactory.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ package scala
1010
package xml
1111
package factory
1212

13+
import scala.collection.Seq
14+
1315
trait NodeFactory[A <: Node] {
1416
val ignoreComments = false
1517
val ignoreProcInstr = false

shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package xml
1111
package parsing
1212

1313
import scala.collection.{ mutable, Iterator }
14+
import scala.collection.Seq
1415
import org.xml.sax.Attributes
1516
import org.xml.sax.helpers.DefaultHandler
1617

shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package scala
1010
package xml
1111
package parsing
1212

13+
import scala.collection.Seq
1314
import Utility.SU
1415

1516
/**

shared/src/main/scala/scala/xml/parsing/NoBindingFactoryAdapter.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package scala
1010
package xml
1111
package parsing
1212

13+
import scala.collection.Seq
1314
import factory.NodeFactory
1415

1516
/**

shared/src/main/scala/scala/xml/parsing/TokenTests.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ package scala
1010
package xml
1111
package parsing
1212

13+
import scala.collection.Seq
14+
1315
/**
1416
* Helper functions for parsing XML fragments
1517
*/

shared/src/main/scala/scala/xml/transform/BasicTransformer.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ package scala
1010
package xml
1111
package transform
1212

13+
import scala.collection.Seq
14+
1315
/**
1416
* A class for XML transformations.
1517
*

shared/src/main/scala/scala/xml/transform/RewriteRule.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ package scala
1010
package xml
1111
package transform
1212

13+
import scala.collection.Seq
14+
1315
/**
1416
* A RewriteRule, when applied to a term, yields either
1517
* the result of rewriting the term or the term itself if the rule

shared/src/main/scala/scala/xml/transform/RuleTransformer.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ package scala
1010
package xml
1111
package transform
1212

13+
import scala.collection.Seq
14+
1315
class RuleTransformer(rules: RewriteRule*) extends BasicTransformer {
1416
override def transform(n: Node): Seq[Node] =
1517
rules.foldLeft(super.transform(n)) { (res, rule) => rule transform res }

shared/src/test/scala/scala/xml/AttributeTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package scala.xml
22

3+
import scala.collection.Seq
34
import org.junit.Test
45
import org.junit.Assert.assertEquals
56

shared/src/test/scala/scala/xml/PatternMatching.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package scala.xml
22

3+
import scala.collection.Seq
34
import org.junit.Test
45
import org.junit.Assert.assertTrue
56
import org.junit.Assert.assertEquals

shared/src/test/scala/scala/xml/Transformers.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package scala.xml
22

3+
import scala.collection.Seq
34
import scala.xml.transform._
45

56
import org.junit.Test

shared/src/test/scala/scala/xml/UtilityTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package scala.xml
22

3+
import scala.collection.Seq
34
import org.junit.Test
45
import org.junit.Assert.assertTrue
56
import org.junit.Assert.assertEquals

shared/src/test/scala/scala/xml/XMLSyntaxTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package scala.xml
22

3+
import scala.collection.Seq
34
import org.junit.Test
45
import org.junit.Assert.assertTrue
56
import org.junit.Assert.assertFalse

shared/src/test/scala/scala/xml/XMLTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.junit.Assert.assertEquals
99
// import scala.xml.parsing.ConstructingParser
1010
import java.io.StringWriter
1111
import scala.collection.Iterable
12+
import scala.collection.Seq
1213
import scala.xml.Utility.sort
1314

1415
object XMLTest {

0 commit comments

Comments
 (0)