single SeqOfNode alias in ScalaVersionSpecific

Author: lrytz

shared/src/main/scala-2.12/scala/xml/ScalaVersionSpecific.scala

@@ -22,9 +22,7 @@ private[xml] object ScalaVersionSpecific {
     override def apply(from: Coll): mutable.Builder[Node, NodeSeq] = NodeSeq.newBuilder
     override def apply(): mutable.Builder[Node, NodeSeq] = NodeSeq.newBuilder
   }
-  type SeqNodeUnapplySeq = scala.collection.Seq[Node]
-
-  type ChildReturnType = scala.collection.Seq[Node]
+  type SeqOfNode = scala.collection.Seq[Node]
 }
 
 private[xml] trait ScalaVersionSpecificNodeSeq extends SeqLike[Node, NodeSeq] { self: NodeSeq =>

shared/src/main/scala-2.13+/scala/xml/ScalaVersionSpecific.scala

@@ -24,9 +24,7 @@ private[xml] object ScalaVersionSpecific {
     def newBuilder(from: Coll): Builder[Node, NodeSeq] = NodeSeq.newBuilder
     def fromSpecific(from: Coll)(it: IterableOnce[Node]): NodeSeq = (NodeSeq.newBuilder ++= from).result()
   }
-  type SeqNodeUnapplySeq = scala.collection.immutable.Seq[Node]
-
-  type ChildReturnType = scala.collection.immutable.Seq[Node]
+  type SeqOfNode = scala.collection.immutable.Seq[Node]
 }
 
 private[xml] trait ScalaVersionSpecificNodeSeq

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

@@ -27,7 +27,7 @@ object Elem {
   def apply(prefix: String, label: String, attributes: MetaData, scope: NamespaceBinding, minimizeEmpty: Boolean, child: Node*): Elem =
     new Elem(prefix, label, attributes, scope, minimizeEmpty, child: _*)
 
-  def unapplySeq(n: Node): Option[(String, String, MetaData, NamespaceBinding, ScalaVersionSpecific.SeqNodeUnapplySeq)] =
+  def unapplySeq(n: Node): Option[(String, String, MetaData, NamespaceBinding, ScalaVersionSpecific.SeqOfNode)] =
     n match {
       case _: SpecialNode | _: Group => None
       case _                         => Some((n.prefix, n.label, n.attributes, n.scope, n.child.toSeq))

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

@@ -28,7 +28,7 @@ object Node {
   /** the empty namespace */
   val EmptyNamespace: String = ""
 
-  def unapplySeq(n: Node): Some[(String, MetaData, ScalaVersionSpecific.SeqNodeUnapplySeq)] =
+  def unapplySeq(n: Node): Some[(String, MetaData, ScalaVersionSpecific.SeqOfNode)] =
     Some((n.label, n.attributes, n.child.toSeq))
 }
 
@@ -120,12 +120,12 @@ abstract class Node extends NodeSeq with ScalaVersionSpecificNode {
    *
    * @return all children of this node
    */
-  def child: ScalaVersionSpecific.ChildReturnType
+  def child: ScalaVersionSpecific.SeqOfNode
 
   /**
    * Children which do not stringify to "" (needed for equality)
    */
-  def nonEmptyChildren: ScalaVersionSpecific.ChildReturnType = child.filterNot(_.toString.isEmpty)
+  def nonEmptyChildren: ScalaVersionSpecific.SeqOfNode = child.filterNot(_.toString.isEmpty)
 
   /**
    * Descendant axis (all descendants of this node, not including node itself)

shared/src/main/scala/scala/xml/QNode.scala

@@ -20,6 +20,6 @@ package xml
  *  @author  Burak Emir
  */
 object QNode {
-  def unapplySeq(n: Node): Some[(String, String, MetaData, ScalaVersionSpecific.SeqNodeUnapplySeq)] =
+  def unapplySeq(n: Node): Some[(String, String, MetaData, ScalaVersionSpecific.SeqOfNode)] =
     Some((n.scope.getURI(n.prefix), n.label, n.attributes, n.child.toSeq))
 }