Fix Fuzzer for 2.11

This fixes two issues with the Fuzzer when running '+publishLocal':

- Avoid foo(_) pattern due to weaker 2.11 type inference
- Use seqAsJavaListConverter instead of seqAsJavaList (a 2.12
  addition)

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/fuzzer/src/main/scala/firrtl/ExprGenParams.scala b/fuzzer/src/main/scala/firrtl/ExprGenParams.scala
index 909f3a16..ddaec00d 100644
--- a/fuzzer/src/main/scala/firrtl/ExprGenParams.scala
+++ b/fuzzer/src/main/scala/firrtl/ExprGenParams.scala
@@ -70,7 +70,7 @@ sealed trait ExprGenParams {
         case SIntType(IntWidth(width)) if width == BigInt(1) => ExprGen.ReferenceGen.boolSIntGen[ExprGenParams, G].get
         case SIntType(IntWidth(width)) => ExprGen.ReferenceGen.sintGen[ExprGenParams, G].get(width)
       }
-      unboundRefs <- StateGen.inspect { ExprState[ExprGenParams].unboundRefs(_) }
+      unboundRefs <- StateGen.inspect { ExprState[ExprGenParams].unboundRefs }
     } yield {
       val outputPort = Port(
         NoInfo,
diff --git a/fuzzer/src/main/scala/firrtl/FirrtlCompileTests.scala b/fuzzer/src/main/scala/firrtl/FirrtlCompileTests.scala
index c891a9ab..9ee8e52b 100644
--- a/fuzzer/src/main/scala/firrtl/FirrtlCompileTests.scala
+++ b/fuzzer/src/main/scala/firrtl/FirrtlCompileTests.scala
@@ -32,7 +32,7 @@ trait SourceOfRandomnessGen[A] {
 
 object SourceOfRandomnessGen {
   implicit def sourceOfRandomnessGenGenMonadInstance(implicit r: SourceOfRandomness): GenMonad[SourceOfRandomnessGen] = new GenMonad[SourceOfRandomnessGen] {
-    import scala.collection.JavaConverters.seqAsJavaList
+    import scala.collection.JavaConverters.seqAsJavaListConverter
     type G[T] = SourceOfRandomnessGen[T]
     def flatMap[A, B](a: G[A])(f: A => G[B]): G[B] = a.flatMap(f)
     def map[A, B](a: G[A])(f: A => B): G[B] = a.map(f)
@@ -40,8 +40,8 @@ object SourceOfRandomnessGen {
       r.nextLong(min, max).toInt // use r.nextLong instead of r.nextInt because r.nextInt is exclusive of max
     }
     def oneOf[T](items: T*): G[T] = {
-      val arr = seqAsJavaList(items)
-      const(arr).map(r.choose(_))
+      val arr = seqAsJavaListConverter(items)
+      const(arr.asJava).map(r.choose(_))
     }
     def const[T](c: T): G[T] = SourceOfRandomnessGen(c)
     def widen[A, B >: A](ga: G[A]): G[B] = ga.widen[B]