From fcf50933c0873163647d9ae9951682005595bf3d Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 27 Mar 2019 14:05:45 +0100 Subject: [PATCH] Revert "adapt to scala/scala#7696" This reverts commit 17647af000bd764faf9e4e422374e7993f911620. the upstream change was reverted, so we revert this too also use latest Scala nightly --- build.sbt | 2 +- core/src/main/scala/scala/collection/immutable/OldHashSet.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 54f2eb68..23836612 100644 --- a/build.sbt +++ b/build.sbt @@ -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), diff --git a/core/src/main/scala/scala/collection/immutable/OldHashSet.scala b/core/src/main/scala/scala/collection/immutable/OldHashSet.scala index 7f1348a7..450aa77c 100644 --- a/core/src/main/scala/scala/collection/immutable/OldHashSet.scala +++ b/core/src/main/scala/scala/collection/immutable/OldHashSet.scala @@ -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))