Skip to content

Commit 88c291d

Browse files
committed
Explicitly convert Array to immutable.Seq
The collections library doesn't do this automatically. Seemingly, this is because org.scalacheck.util.SerializableCanBuildFroms has implicits that interfere.
1 parent ed05010 commit 88c291d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/main/scala/org/scalacheck/Arbitrary.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ private[scalacheck] sealed trait ArbitraryLowPriority {
372372

373373
implicit def arbEnum[A <: java.lang.Enum[A]](implicit A: reflect.ClassTag[A]): Arbitrary[A] = {
374374
val values = A.runtimeClass.getEnumConstants.asInstanceOf[Array[A]]
375-
Arbitrary(Gen.oneOf(values))
375+
Arbitrary(Gen.oneOf(values.to[Vector]))
376376
}
377377

378378
implicit def arbPartialFunction[A: Cogen, B: Arbitrary]: Arbitrary[PartialFunction[A, B]] =

src/main/scala/org/scalacheck/Gen.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ object Gen extends GenArities{
531531
}
532532

533533
/** Picks a random value from a list */
534-
def oneOf[T](t0: T, t1: T, tn: T*): Gen[T] = oneOf(t0 +: t1 +: tn)
534+
def oneOf[T](t0: T, t1: T, tn: T*): Gen[T] = oneOf((t0 +: t1 +: tn).to[Vector])
535535

536536
/** Picks a random generator from a list */
537537
def oneOf[T](g0: Gen[T], g1: Gen[T], gn: Gen[T]*): Gen[T] = {
@@ -708,7 +708,7 @@ object Gen extends GenArities{
708708
seed = s
709709
}
710710
}
711-
r(Some(buf), seed)
711+
r(Some(buf.to[Vector]), seed)
712712
}
713713
}
714714

src/main/scala/org/scalacheck/Properties.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ package org.scalacheck
1212
import org.scalacheck.rng.Seed
1313

1414
import language.reflectiveCalls
15+
import collection.immutable.Seq
1516

1617
import util.ConsoleReporter
1718

@@ -41,7 +42,7 @@ class Properties(val name: String) {
4142

4243
/** Returns all properties of this collection in a list of name/property
4344
* pairs. */
44-
def properties: collection.Seq[(String,Prop)] = props
45+
def properties: Seq[(String,Prop)] = props.to[Seq]
4546

4647
/** Convenience method that checks the properties with the given parameters
4748
* (or default parameters, if not specified)

0 commit comments

Comments
 (0)