summaryrefslogtreecommitdiff
path: root/src/main/scala/spray/json/package.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala/spray/json/package.scala')
-rw-r--r--src/main/scala/spray/json/package.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/scala/spray/json/package.scala b/src/main/scala/spray/json/package.scala
index 37d63c2..a8a42f0 100644
--- a/src/main/scala/spray/json/package.scala
+++ b/src/main/scala/spray/json/package.scala
@@ -24,7 +24,7 @@ package object json {
def serializationError(msg: String) = throw new SerializationException(msg)
def jsonReader[T](implicit reader: JsonReader[T]) = reader
- def jsonWriter[T](implicit writer: JsonWriter[T]) = writer
+ def jsonWriter[T](implicit writer: JsonWriter[T]) = writer
implicit def enrichAny[T](any: T) = new RichAny(any)
implicit def enrichString(string: String) = new RichString(string)
@@ -48,6 +48,7 @@ package json {
@deprecated("deprecated in favor of parseJson", "1.2.6")
def asJson: JsValue = parseJson
def parseJson: JsValue = JsonParser(string)
+ def parseJson(settings: JsonParserSettings): JsValue = JsonParser(string, settings)
}
@deprecated("use RichAny", "1.3.4")