diff options
author | kenji yoshida <6b656e6a69@gmail.com> | 2018-08-07 19:07:58 +0900 |
---|---|---|
committer | Johannes Rudolph <johannes.rudolph@gmail.com> | 2018-08-07 12:07:58 +0200 |
commit | 0131537d5635f0af53314d87eb6ed1fb42ae0c4b (patch) | |
tree | f0a36b3369f7ddb189374fdf112675d0022b6488 /src/main/scala | |
parent | 3e4d7da9b35abde4e110d0c61ea251da2697667c (diff) | |
download | spray-json-0131537d5635f0af53314d87eb6ed1fb42ae0c4b.tar.gz spray-json-0131537d5635f0af53314d87eb6ed1fb42ae0c4b.tar.bz2 spray-json-0131537d5635f0af53314d87eb6ed1fb42ae0c4b.zip |
Add support for Scala 2.13.0-M4 (#263)v1.3.4-2.13.0-M4
Diffstat (limited to 'src/main/scala')
-rw-r--r-- | src/main/scala/spray/json/CollectionFormats.scala | 4 | ||||
-rw-r--r-- | src/main/scala/spray/json/JsValue.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/spray/json/CollectionFormats.scala b/src/main/scala/spray/json/CollectionFormats.scala index 9a3e8fd..ef94297 100644 --- a/src/main/scala/spray/json/CollectionFormats.scala +++ b/src/main/scala/spray/json/CollectionFormats.scala @@ -27,7 +27,7 @@ trait CollectionFormats { implicit def listFormat[T :JsonFormat] = new RootJsonFormat[List[T]] { def write(list: List[T]) = JsArray(list.map(_.toJson).toVector) def read(value: JsValue): List[T] = value match { - case JsArray(elements) => elements.map(_.convertTo[T])(collection.breakOut) + case JsArray(elements) => elements.toIterator.map(_.convertTo[T]).toList case x => deserializationError("Expected List as JsArray, but got " + x) } } @@ -59,7 +59,7 @@ trait CollectionFormats { def read(value: JsValue) = value match { case x: JsObject => x.fields.map { field => (JsString(field._1).convertTo[K], field._2.convertTo[V]) - } (collection.breakOut) + } case x => deserializationError("Expected Map as JsObject, but got " + x) } } diff --git a/src/main/scala/spray/json/JsValue.scala b/src/main/scala/spray/json/JsValue.scala index 08a673b..7cd8cd8 100644 --- a/src/main/scala/spray/json/JsValue.scala +++ b/src/main/scala/spray/json/JsValue.scala @@ -50,7 +50,7 @@ sealed abstract class JsValue { */ case class JsObject(fields: Map[String, JsValue]) extends JsValue { override def asJsObject(errorMsg: String) = this - def getFields(fieldNames: String*): immutable.Seq[JsValue] = fieldNames.flatMap(fields.get)(collection.breakOut) + def getFields(fieldNames: String*): immutable.Seq[JsValue] = fieldNames.toIterator.flatMap(fields.get).toList } object JsObject { val empty = JsObject(Map.empty[String, JsValue]) |