Skip to content

Commit 2784940

Browse files
committed
Workaroung not valid result type for unapplySeq: scala/scala3#3248
1 parent 46f72fe commit 2784940

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

scalatest/src/main/scala/org/scalatest/StreamlinedXml.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,17 @@ trait StreamlinedXml {
136136
node match {
137137
case Text(text) if (text.trim.isEmpty) => Nil
138138
case Text(text) => List(Text(text.trim))
139-
case Elem(pre, lab, md, scp, children @ _*) =>
140-
Elem(pre, lab, md, scp, false, (children.flatMap(trimTextZappingEmpty)):_*)
139+
case e: Elem=>
140+
Elem(e.prefix, e.label, e.attributes, e.scope, false, (e.child.flatMap(trimTextZappingEmpty)):_*)
141141
case _ => List(node)
142142
}
143143

144144
new Uniformity[T] {
145145
def normalized(nodeSeq: T): T =
146146
nodeSeq match {
147-
case Elem(pre, lab, md, scp, children @ _*) =>
147+
case e: Elem =>
148148
val mergedTextNodes = // Merge adjacent text nodes
149-
children.foldLeft(Nil: List[Node]) { (acc, ele) =>
149+
e.child.foldLeft(Nil: List[Node]) { (acc, ele) =>
150150
ele match {
151151
case eleTxt: Text =>
152152
acc.headOption match {
@@ -157,7 +157,7 @@ trait StreamlinedXml {
157157
case _ => ele :: acc
158158
}
159159
}
160-
Elem(pre, lab, md, scp, false, (mergedTextNodes.flatMap(trimTextZappingEmpty)):_*).asInstanceOf[T]
160+
Elem(e.prefix, e.label, e.attributes, e.scope, false, (mergedTextNodes.flatMap(trimTextZappingEmpty)):_*).asInstanceOf[T]
161161
case _ => nodeSeq
162162
}
163163

0 commit comments

Comments
 (0)