Skip to content

Commit 7fc8085

Browse files
committed
keep up with latest 2.13 changes
this makes the code compile, but there are still test failures. it's okay, the 2.13 community build won't let us forget.
1 parent 632a2f9 commit 7fc8085

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version in ThisBuild := "0.1.3-SNAPSHOT"
55
resolvers in ThisBuild += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"
66

77
scalaVersionsByJvm in ThisBuild := {
8-
val v213 = "2.13.0-pre-e959f6c" // Feb 5
8+
val v213 = "2.13.0-pre-d645559" // Feb 27
99
Map(
1010
8 -> List(v213 -> true),
1111
11 -> List(v213 -> false))

core/src/main/scala/scala/collection/parallel/mutable/ParHashMap.scala

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

6363
def splitter = new ParHashMapIterator(1, table.length, size, table(0).asInstanceOf[DefaultEntry[K, V]])
6464

65-
def knownSize = tableSize
65+
override def knownSize = tableSize
6666

6767
def clear() = clearTable()
6868

core/src/main/scala/scala/collection/parallel/mutable/ParHashSet.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ extends ParSet[T]
6363
// TODO Redesign ParHashSet so that it can be converted to a mutable.HashSet in constant time
6464
def seq = scala.collection.mutable.HashSet.from(this)
6565

66-
def knownSize = tableSize
66+
override def knownSize = tableSize
6767

6868
def addOne(elem: T) = {
6969
addElem(elem)

core/src/main/scala/scala/collection/parallel/mutable/ParMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ object ParMap extends ParMapFactory[ParMap] {
7171

7272
class WithDefault[K, V](underlying: ParMap[K, V], d: K => V)
7373
extends scala.collection.parallel.ParMap.WithDefault(underlying, d) with ParMap[K, V] {
74-
def knownSize = underlying.knownSize
74+
override def knownSize = underlying.knownSize
7575
def addOne(kv: (K, V)) = {underlying += kv; this}
7676
def subtractOne(key: K) = {underlying -= key; this}
7777
override def empty = new WithDefault(underlying.empty, d)

core/src/main/scala/scala/collection/parallel/mutable/ParTrieMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ extends ParMap[K, V]
9090
}
9191
}
9292

93-
def knownSize = -1
93+
override def knownSize = -1
9494

9595
override def stringPrefix = "ParTrieMap"
9696

0 commit comments

Comments
 (0)