Skip to content

Commit

Permalink
Revert "adapt to scala/scala#7696"
Browse files Browse the repository at this point in the history
This reverts commit 17647af.

the upstream change was reverted, so we revert this too

also use latest Scala nightly
  • Loading branch information
SethTisue committed Mar 27, 2019
1 parent 63fa3cc commit fcf5093
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Expand Up @@ -5,7 +5,7 @@ version in ThisBuild := "0.1.3-SNAPSHOT"
resolvers in ThisBuild += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"

scalaVersionsByJvm in ThisBuild := {
val v213 = "2.13.0-pre-d645559" // Feb 27
val v213 = "2.13.0-pre-eb074a8" // Mar 27
Map(
8 -> List(v213 -> true),
11 -> List(v213 -> false),
Expand Down
Expand Up @@ -50,7 +50,7 @@ sealed abstract class OldHashSet[A]
super.subsetOf(that)
}

override def concat(that: collection.IterableOnce[A])(implicit dummy: DummyImplicit): OldHashSet[A] = that match {
override def concat(that: collection.IterableOnce[A]): OldHashSet[A] = that match {
case that: OldHashSet[A] =>
val buffer = new Array[OldHashSet[A]](bufferSize(this.size + that.size))
nullToEmpty(union0(that, 0, buffer, 0))
Expand Down

0 comments on commit fcf5093

Please sign in to comment.