summaryrefslogtreecommitdiff
path: root/src/main/scala/spray/json/package.scala
diff options
context:
space:
mode:
authorJohannes Rudolph <johannes.rudolph@gmail.com>2018-11-07 14:50:18 +0100
committerGitHub <noreply@github.com>2018-11-07 14:50:18 +0100
commitddb4e1e7c0e28f06f703dd5e325b59fd0548bd97 (patch)
tree9f48a32ca9ce0cf5bd17f993e4556ebdaa661866 /src/main/scala/spray/json/package.scala
parent414948434f70d3279215686251315818a49e66f9 (diff)
parent3ccb0768cb5ccb0c4b577742ee7f1ec7d3b9c83f (diff)
downloadspray-json-ddb4e1e7c0e28f06f703dd5e325b59fd0548bd97.tar.gz
spray-json-ddb4e1e7c0e28f06f703dd5e325b59fd0548bd97.tar.bz2
spray-json-ddb4e1e7c0e28f06f703dd5e325b59fd0548bd97.zip
Merge pull request #282 from jrudolph/introduce-JsonParserSettings
Introduce JsonParserSettings to allow customization of parsing
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")