summaryrefslogtreecommitdiff
path: root/src/main/scala/spray/json/CollectionFormats.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala/spray/json/CollectionFormats.scala')
-rw-r--r--src/main/scala/spray/json/CollectionFormats.scala4
1 files changed, 2 insertions, 2 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)
}
}