Fix yaml module on Scala 2.11

pureconfig · Jan 19, 2019 · a6027d4 · a6027d4
1 parent cce3f5f
commit a6027d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/src/main/scala/pureconfig/FluentConfigCursor.scala b/core/src/main/scala/pureconfig/FluentConfigCursor.scala
@@ -107,7 +107,7 @@ case class FluentConfigCursor(cursor: ConfigReader.Result[ConfigCursor]) {
    * @return a `Right` with the list obtained by mapping all elements of the list pointed to by this cursor if all
    *         casts and mappings can be done, `Left` with a list of failures otherwise.
    */
-  def mapList[A](f: ConfigCursor => ConfigReader.Result[A]) =
+  def mapList[A](f: ConfigCursor => ConfigReader.Result[A]): ConfigReader.Result[List[A]] =
     asListCursor.right.flatMap { listCur => ConfigReader.Result.sequence(listCur.list.map(f)) }
 
   /**

diff --git a/modules/yaml/src/main/scala/pureconfig/module/yaml/package.scala b/modules/yaml/src/main/scala/pureconfig/module/yaml/package.scala
@@ -5,7 +5,6 @@ import java.nio.file.{ Files, Path }
 import java.util.Base64
 
 import scala.collection.JavaConverters._
-import scala.collection.mutable
 import scala.reflect.ClassTag
 import scala.util.Try
 import scala.util.control.NonFatal
@@ -26,11 +25,11 @@ package object yaml {
 
     def aux(obj: AnyRef): ConfigReader.Result[AnyRef] = obj match {
       case m: java.util.Map[AnyRef @unchecked, AnyRef @unchecked] =>
-        val entries = m.asScala.map {
+        val entries: Iterable[ConfigReader.Result[(String, AnyRef)]] = m.asScala.map {
           case (k: String, v) => aux(v).right.map { v: AnyRef => k -> v }
           case (k, _) => Left(ConfigReaderFailures(NonStringKeyFound(k.toString, k.getClass.getSimpleName)))
         }
-        ConfigReader.Result.sequence[(String, AnyRef), mutable.Iterable](entries).right.map(_.toMap.asJava)
+        ConfigReader.Result.sequence(entries).right.map(_.toMap.asJava)
 
       case xs: java.util.List[AnyRef @unchecked] =>
         ConfigReader.Result.sequence(xs.asScala.map(aux)).right.map(_.toList.asJava)