Skip to content

Commit f81af3c

Browse files
SethTisueSethTisue
committed
bump Scala version to 2.13.3
1 parent 7b965ec commit f81af3c

18 files changed

+64
-64
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
55
language: scala
66

77
scala:
8-
- 2.13.2
8+
- 2.13.3
99

1010
env:
1111
- ADOPTOPENJDK=8

‎core/src/main/scala/scala/collection/generic/GenericTraversableTemplate.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ trait GenericTraversableTemplate[+A, +CC[X] <: ParIterable[X]] extends HasNewBui
226226
fail
227227
}
228228
val bb = genericBuilder[CC[B]]
229-
for (b <- bs) bb += b.result
229+
for (b <- bs) bb += b.result()
230230
bb.result()
231231
}
232232
}

‎core/src/main/scala/scala/collection/parallel/ParIterable.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ trait ParIterable[+T]
3737
object ParIterable extends ParFactory[ParIterable] {
3838
implicit def canBuildFrom[T]: CanCombineFrom[ParIterable[_], T, ParIterable[T]] = new GenericCanCombineFrom[T]
3939

40-
def newBuilder[T]: Combiner[T, ParIterable[T]] = ParArrayCombiner[T]
40+
def newBuilder[T]: Combiner[T, ParIterable[T]] = ParArrayCombiner[T]()
4141

42-
def newCombiner[T]: Combiner[T, ParIterable[T]] = ParArrayCombiner[T]
42+
def newCombiner[T]: Combiner[T, ParIterable[T]] = ParArrayCombiner[T]()
4343
}
4444

‎core/src/main/scala/scala/collection/parallel/ParIterableLike.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ self =>
626626
val it = splitter
627627
var left = n
628628
while (left > 0) {
629-
cb += it.next
629+
cb += it.next()
630630
left -= 1
631631
}
632632
cb.resultWithTaskSupport
@@ -642,7 +642,7 @@ self =>
642642
val it = splitter drop n
643643
val cb = newCombiner
644644
cb.sizeHint(size - n)
645-
while (it.hasNext) cb += it.next
645+
while (it.hasNext) cb += it.next()
646646
cb.resultWithTaskSupport
647647
}
648648

@@ -658,7 +658,7 @@ self =>
658658
var left = until - from
659659
val it = splitter drop from
660660
while (left > 0) {
661-
cb += it.next
661+
cb += it.next()
662662
left -= 1
663663
}
664664
cb.resultWithTaskSupport
@@ -1291,7 +1291,7 @@ self =>
12911291
@volatile var result: Result = null
12921292
def leaf(prev: Option[Combiner[U, That]]): Unit = {
12931293
result = cbf()
1294-
while (pit.hasNext) result += pit.next
1294+
while (pit.hasNext) result += pit.next()
12951295
}
12961296
protected[this] def newSubtask(p: IterableSplitter[T]) = new ToParCollection[U, That](cbf, p)
12971297
override def merge(that: ToParCollection[U, That]) = result = result combine that.result
@@ -1302,7 +1302,7 @@ self =>
13021302
@volatile var result: Result = null
13031303
def leaf(prev: Option[Combiner[(K, V), That]]): Unit = {
13041304
result = cbf()
1305-
while (pit.hasNext) result += pit.next
1305+
while (pit.hasNext) result += pit.next()
13061306
}
13071307
protected[this] def newSubtask(p: IterableSplitter[T]) = new ToParMap[K, V, That](cbf, p)(ev)
13081308
override def merge(that: ToParMap[K, V, That]) = result = result combine that.result

‎core/src/main/scala/scala/collection/parallel/ParSeq.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ trait ParSeq[+T] extends ParIterable[T]
4444
object ParSeq extends ParFactory[ParSeq] {
4545
implicit def canBuildFrom[T]: CanCombineFrom[ParSeq[_], T, ParSeq[T]] = new GenericCanCombineFrom[T]
4646

47-
def newBuilder[T]: Combiner[T, ParSeq[T]] = ParArrayCombiner[T]
48-
def newCombiner[T]: Combiner[T, ParSeq[T]] = ParArrayCombiner[T]
47+
def newBuilder[T]: Combiner[T, ParSeq[T]] = ParArrayCombiner[T]()
48+
def newCombiner[T]: Combiner[T, ParSeq[T]] = ParArrayCombiner[T]()
4949
}

‎core/src/main/scala/scala/collection/parallel/RemainsIterator.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private[collection] trait AugmentedIterableIterator[+T] extends RemainsIterator[
126126

127127
def copy2builder[U >: T, Coll, Bld <: Builder[U, Coll]](b: Bld): Bld = {
128128
if (isRemainingCheap) b.sizeHint(remaining)
129-
while (hasNext) b += next
129+
while (hasNext) b += next()
130130
b
131131
}
132132

@@ -159,7 +159,7 @@ private[collection] trait AugmentedIterableIterator[+T] extends RemainsIterator[
159159
cb.sizeHint(n)
160160
var left = n
161161
while (left > 0) {
162-
cb += next
162+
cb += next()
163163
left -= 1
164164
}
165165
cb
@@ -168,7 +168,7 @@ private[collection] trait AugmentedIterableIterator[+T] extends RemainsIterator[
168168
def drop2combiner[U >: T, This](n: Int, cb: Combiner[U, This]): Combiner[U, This] = {
169169
drop(n)
170170
if (isRemainingCheap) cb.sizeHint(remaining)
171-
while (hasNext) cb += next
171+
while (hasNext) cb += next()
172172
cb
173173
}
174174

@@ -177,7 +177,7 @@ private[collection] trait AugmentedIterableIterator[+T] extends RemainsIterator[
177177
var left = scala.math.max(until - from, 0)
178178
cb.sizeHint(left)
179179
while (left > 0) {
180-
cb += next
180+
cb += next()
181181
left -= 1
182182
}
183183
cb
@@ -188,10 +188,10 @@ private[collection] trait AugmentedIterableIterator[+T] extends RemainsIterator[
188188
if (isRemainingCheap) after.sizeHint(remaining - at)
189189
var left = at
190190
while (left > 0) {
191-
before += next
191+
before += next()
192192
left -= 1
193193
}
194-
while (hasNext) after += next
194+
while (hasNext) after += next()
195195
(before, after)
196196
}
197197

@@ -216,7 +216,7 @@ private[collection] trait AugmentedIterableIterator[+T] extends RemainsIterator[
216216
isBefore = false
217217
}
218218
}
219-
while (hasNext) after += next
219+
while (hasNext) after += next()
220220
(before, after)
221221
}
222222

@@ -320,7 +320,7 @@ private[collection] trait AugmentedSeqIterator[+T] extends AugmentedIterableIter
320320
def reverse2combiner[U >: T, This](cb: Combiner[U, This]): Combiner[U, This] = {
321321
if (isRemainingCheap) cb.sizeHint(remaining)
322322
var lst = List[T]()
323-
while (hasNext) lst ::= next
323+
while (hasNext) lst ::= next()
324324
while (lst != Nil) {
325325
cb += lst.head
326326
lst = lst.tail
@@ -348,7 +348,7 @@ private[collection] trait AugmentedSeqIterator[+T] extends AugmentedIterableIter
348348
if (j == index) {
349349
cb += elem
350350
next()
351-
} else cb += next
351+
} else cb += next()
352352
j += 1
353353
}
354354
cb
@@ -439,7 +439,7 @@ self =>
439439
private[collection] def newSliceInternal[U <: Taken](it: U, from1: Int): U = {
440440
var count = from1
441441
while (count > 0 && it.hasNext) {
442-
it.next
442+
it.next()
443443
count -= 1
444444
}
445445
it
@@ -656,7 +656,7 @@ self =>
656656
(pits(0).appendParSeq[U, SeqSplitter[U]](patch)) appendParSeq pits(2)
657657
}
658658
def hasNext = trio.hasNext
659-
def next() = trio.next
659+
def next() = trio.next()
660660
def remaining = trio.remaining
661661
def dup = self.dup.patchParSeq(from, patch, replaced)
662662
def split = trio.split

‎core/src/main/scala/scala/collection/parallel/immutable/ParHashMap.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,10 @@ extends scala.collection.parallel.BucketCombiner[(K, V), ParHashMap[K, V], (K, V
306306
}
307307
private def evaluateCombiners(trie: OldHashMap[K, Combiner[V, Repr]]): OldHashMap[K, Repr] = trie match {
308308
case hm1: OldHashMap.OldHashMap1[_, _] =>
309-
val evaledvalue = hm1.value.result
309+
val evaledvalue = hm1.value.result()
310310
new OldHashMap.OldHashMap1[K, Repr](hm1.key, hm1.hash, evaledvalue, null)
311311
case hmc: OldHashMap.OldHashMapCollision1[_, _] =>
312-
val evaledkvs = hmc.kvs map { p => (p._1, p._2.result) }
312+
val evaledkvs = hmc.kvs map { p => (p._1, p._2.result()) }
313313
new OldHashMap.OldHashMapCollision1[K, Repr](hmc.hash, evaledkvs)
314314
case htm: OldHashMap.HashTrieMap[k, v] =>
315315
var i = 0

‎core/src/main/scala/scala/collection/parallel/immutable/ParRange.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ self =>
104104

105105
override def map2combiner[S, That](f: Int => S, cb: Combiner[S, That]): Combiner[S, That] = {
106106
while (hasNext) {
107-
cb += f(next)
107+
cb += f(next())
108108
}
109109
cb
110110
}

‎core/src/main/scala/scala/collection/parallel/immutable/ParVector.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ private[immutable] class LazyParVectorCombiner[T] extends Combiner[T, ParVector[
122122
def result(): ParVector[T] = {
123123
val rvb = new VectorBuilder[T]
124124
for (vb <- vectors) {
125-
rvb ++= vb.result
125+
rvb ++= vb.result()
126126
}
127-
new ParVector(rvb.result)
127+
new ParVector(rvb.result())
128128
}
129129

130130
def combine[U <: T, NewTo >: ParVector[T]](other: Combiner[U, NewTo]) = if (other eq this) this else {

‎core/src/main/scala/scala/collection/parallel/mutable/ParArray.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ self =>
375375
var same = true
376376
val thatIt = that.iterator
377377
while (i < until && thatIt.hasNext) {
378-
if (arr(i) != thatIt.next) {
378+
if (arr(i) != thatIt.next()) {
379379
i = until
380380
same = false
381381
}
@@ -693,7 +693,7 @@ self =>
693693
object ParArray extends ParFactory[ParArray] {
694694
implicit def canBuildFrom[T]: CanCombineFrom[ParArray[_], T, ParArray[T]] = new GenericCanCombineFrom[T]
695695
def newBuilder[T]: Combiner[T, ParArray[T]] = newCombiner
696-
def newCombiner[T]: Combiner[T, ParArray[T]] = ParArrayCombiner[T]
696+
def newCombiner[T]: Combiner[T, ParArray[T]] = ParArrayCombiner[T]()
697697

698698
/** Creates a new parallel array by wrapping the specified array.
699699
*/
@@ -720,7 +720,7 @@ object ParArray extends ParFactory[ParArray] {
720720
for (xs <- xss) {
721721
cb ++= xs
722722
}
723-
cb.result
723+
cb.result()
724724
}
725725

726726
}

‎core/src/main/scala/scala/collection/parallel/mutable/ParIterable.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ trait ParIterable[T] extends scala.collection.parallel.ParIterable[T]
4444
object ParIterable extends ParFactory[ParIterable] {
4545
implicit def canBuildFrom[T]: CanCombineFrom[ParIterable[_], T, ParIterable[T]] = new GenericCanCombineFrom[T]
4646

47-
def newBuilder[T]: Combiner[T, ParIterable[T]] = ParArrayCombiner[T]
48-
def newCombiner[T]: Combiner[T, ParIterable[T]] = ParArrayCombiner[T]
47+
def newBuilder[T]: Combiner[T, ParIterable[T]] = ParArrayCombiner[T]()
48+
def newCombiner[T]: Combiner[T, ParIterable[T]] = ParArrayCombiner[T]()
4949
}

‎core/src/main/scala/scala/collection/parallel/mutable/ParSeq.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ self =>
4848
object ParSeq extends ParFactory[ParSeq] {
4949
implicit def canBuildFrom[T]: CanCombineFrom[ParSeq[_], T, ParSeq[T]] = new GenericCanCombineFrom[T]
5050

51-
def newBuilder[T]: Combiner[T, ParSeq[T]] = ParArrayCombiner[T]
51+
def newBuilder[T]: Combiner[T, ParSeq[T]] = ParArrayCombiner[T]()
5252

53-
def newCombiner[T]: Combiner[T, ParSeq[T]] = ParArrayCombiner[T]
53+
def newCombiner[T]: Combiner[T, ParSeq[T]] = ParArrayCombiner[T]()
5454
}

‎junit/src/test/scala/scala/SerializationStabilityTest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ object SerializationStability extends App {
3535
}
3636

3737
def amend(file: File)(f: String => String): Unit = {
38-
file.writeAll(f(file.slurp))
38+
file.writeAll(f(file.slurp()))
3939
}
4040
def quote(s: String) = List("\"", s, "\"").mkString
4141

@@ -44,7 +44,7 @@ object SerializationStability extends App {
4444
content =>
4545
content.linesIterator.toList.zipWithIndex.map {
4646
case (content, i) if i == line - 1 =>
47-
val newContent = content.replaceAllLiterally(quote(prevResult), quote(result))
47+
val newContent = content.replace(quote(prevResult), quote(result))
4848
if (newContent != content)
4949
println(s"- $content\n+ $newContent\n")
5050
newContent
@@ -113,4 +113,4 @@ object SerializationStability extends App {
113113
class SerializationStabilityTest {
114114
@Test
115115
def testAll: Unit = SerializationStability.main(new Array[String](0))
116-
}
116+
}

‎junit/src/test/scala/scala/collection/concurrent/ctries_new/IteratorSpec.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class IteratorSpec extends Spec {
2525
val it = ct.iterator
2626

2727
it.hasNext shouldEqual (false)
28-
evaluating { it.next() }.shouldProduce [NoSuchElementException]
28+
evaluating { it.next() }.shouldProduce[NoSuchElementException]()
2929
}
3030

3131
def nonEmptyIteratorCheck(sz: Int): Unit = {
@@ -36,11 +36,11 @@ class IteratorSpec extends Spec {
3636
val tracker = mutable.Map[Wrap, Int]()
3737
for (i <- 0 until sz) {
3838
assert(it.hasNext == true)
39-
tracker += it.next
39+
tracker += it.next()
4040
}
4141

4242
it.hasNext shouldEqual (false)
43-
evaluating { it.next() }.shouldProduce [NoSuchElementException]
43+
evaluating { it.next() }.shouldProduce[NoSuchElementException]()
4444
tracker.size shouldEqual (sz)
4545
tracker shouldEqual (ct)
4646
}
@@ -101,11 +101,11 @@ class IteratorSpec extends Spec {
101101
val tracker = mutable.Map[DumbHash, Int]()
102102
for (i <- 0 until sz) {
103103
assert(it.hasNext == true)
104-
tracker += it.next
104+
tracker += it.next()
105105
}
106106

107107
it.hasNext shouldEqual (false)
108-
evaluating { it.next() }.shouldProduce [NoSuchElementException]
108+
evaluating { it.next() }.shouldProduce[NoSuchElementException]()
109109
tracker.size shouldEqual (sz)
110110
tracker shouldEqual (ct)
111111
}

‎junit/src/test/scala/scala/collection/concurrent/ctries_old/IteratorSpec.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class IteratorSpec extends Spec {
2626
val it = ct.iterator
2727

2828
it.hasNext shouldEqual (false)
29-
evaluating { it.next() }.shouldProduce [NoSuchElementException]
29+
evaluating { it.next() }.shouldProduce[NoSuchElementException]()
3030
}
3131

3232
def nonEmptyIteratorCheck(sz: Int): Unit = {
@@ -37,11 +37,11 @@ class IteratorSpec extends Spec {
3737
val tracker = mutable.Map[Wrap, Int]()
3838
for (i <- 0 until sz) {
3939
assert(it.hasNext == true)
40-
tracker += it.next
40+
tracker += it.next()
4141
}
4242

4343
it.hasNext shouldEqual (false)
44-
evaluating { it.next() }.shouldProduce [NoSuchElementException]
44+
evaluating { it.next() }.shouldProduce[NoSuchElementException]()
4545
tracker.size shouldEqual (sz)
4646
tracker shouldEqual (ct)
4747
}
@@ -102,11 +102,11 @@ class IteratorSpec extends Spec {
102102
val tracker = mutable.Map[DumbHash, Int]()
103103
for (i <- 0 until sz) {
104104
assert(it.hasNext == true)
105-
tracker += it.next
105+
tracker += it.next()
106106
}
107107

108108
it.hasNext shouldEqual (false)
109-
evaluating { it.next() }.shouldProduce [NoSuchElementException]
109+
evaluating { it.next() }.shouldProduce[NoSuchElementException]()
110110
tracker.size shouldEqual (sz)
111111
tracker shouldEqual (ct)
112112
}

‎scalacheck/src/test/scala/ParallelHashTrieCheck.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ with PairValues[Int, Int]
6969

7070
override def printDataStructureDebugInfo(ds: AnyRef) = ds match {
7171
case pm: ParHashMap[k, v] =>
72-
pm.printDebugInfo
72+
pm.printDebugInfo()
7373
case _ =>
7474
println("could not match data structure type: " + ds.getClass)
7575
}
@@ -124,7 +124,7 @@ with IntValues
124124

125125
override def printDataStructureDebugInfo(ds: AnyRef) = ds match {
126126
case pm: ParHashMap[k, v] =>
127-
pm.printDebugInfo
127+
pm.printDebugInfo()
128128
case _ =>
129129
println("could not match data structure type: " + ds.getClass)
130130
}

0 commit comments

Comments
 (0)