Skip to content

Commit 7c2e8f8

Browse files
authored
Merge pull request scala/scala#11012 from som-snytt/issue/13095-patvar
Collect nowarn symbols instead of skipping them
2 parents 202d254 + ad07a74 commit 7c2e8f8

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

library/src/scala/Array.scala

+10-10
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,16 @@ object Array {
124124
* @see `java.util.Arrays#copyOf`
125125
*/
126126
def copyOf[A](original: Array[A], newLength: Int): Array[A] = ((original: @unchecked) match {
127-
case x: Array[BoxedUnit] => newUnitArray(newLength).asInstanceOf[Array[A]]
128-
case x: Array[AnyRef] => java.util.Arrays.copyOf(x, newLength)
129-
case x: Array[Int] => java.util.Arrays.copyOf(x, newLength)
130-
case x: Array[Double] => java.util.Arrays.copyOf(x, newLength)
131-
case x: Array[Long] => java.util.Arrays.copyOf(x, newLength)
132-
case x: Array[Float] => java.util.Arrays.copyOf(x, newLength)
133-
case x: Array[Char] => java.util.Arrays.copyOf(x, newLength)
134-
case x: Array[Byte] => java.util.Arrays.copyOf(x, newLength)
135-
case x: Array[Short] => java.util.Arrays.copyOf(x, newLength)
136-
case x: Array[Boolean] => java.util.Arrays.copyOf(x, newLength)
127+
case original: Array[BoxedUnit] => newUnitArray(newLength).asInstanceOf[Array[A]]
128+
case original: Array[AnyRef] => java.util.Arrays.copyOf(original, newLength)
129+
case original: Array[Int] => java.util.Arrays.copyOf(original, newLength)
130+
case original: Array[Double] => java.util.Arrays.copyOf(original, newLength)
131+
case original: Array[Long] => java.util.Arrays.copyOf(original, newLength)
132+
case original: Array[Float] => java.util.Arrays.copyOf(original, newLength)
133+
case original: Array[Char] => java.util.Arrays.copyOf(original, newLength)
134+
case original: Array[Byte] => java.util.Arrays.copyOf(original, newLength)
135+
case original: Array[Short] => java.util.Arrays.copyOf(original, newLength)
136+
case original: Array[Boolean] => java.util.Arrays.copyOf(original, newLength)
137137
}).asInstanceOf[Array[A]]
138138

139139
/** Copy one array to another, truncating or padding with default values (if

library/src/scala/collection/Iterable.scala

+6-4
Original file line numberDiff line numberDiff line change
@@ -725,10 +725,12 @@ trait IterableOps[+A, +CC[_], +C] extends Any with IterableOnce[A] with Iterable
725725
* @return a new $coll which contains all elements
726726
* of this $coll followed by all elements of `suffix`.
727727
*/
728-
def concat[B >: A](suffix: IterableOnce[B]): CC[B] = iterableFactory.from(suffix match {
729-
case xs: Iterable[B] => new View.Concat(this, xs)
730-
case xs => iterator ++ suffix.iterator
731-
})
728+
def concat[B >: A](suffix: IterableOnce[B]): CC[B] = iterableFactory.from {
729+
suffix match {
730+
case suffix: Iterable[B] => new View.Concat(this, suffix)
731+
case suffix => iterator ++ suffix.iterator
732+
}
733+
}
732734

733735
/** Alias for `concat` */
734736
@inline final def ++ [B >: A](suffix: IterableOnce[B]): CC[B] = concat(suffix)

0 commit comments

Comments
 (0)