diff options
| author | Philippus Baalman <philippus@gmail.com> | 2019-04-15 14:21:25 +0200 |
|---|---|---|
| committer | Arnout Engelen <github@bzzt.net> | 2019-04-15 12:21:25 +0000 |
| commit | a2e667e99a0e11cb624e9e887109d755bf4d66e9 (patch) | |
| tree | 4865e7a6f06643b6d2e5a7f864a08c477d00b00e /src | |
| parent | 0b893f26ed2fd71649389e7eccc7bba6f1507946 (diff) | |
| download | spray-json-a2e667e99a0e11cb624e9e887109d755bf4d66e9.tar.gz spray-json-a2e667e99a0e11cb624e9e887109d755bf4d66e9.tar.bz2 spray-json-a2e667e99a0e11cb624e9e887109d755bf4d66e9.zip | |
Update scala 2.13.0-M5 to 2.13.0-RC1 (#294)
* Update specs2 to 4.5.1
* Update scala 2.13.0-M5 to 2.13.0-RC1
* Replace deprecated unicode arrows
* Replace deprecated symbol literals
* Update scala 2.12.7 to 2.12.8
* Update sbt to 1.2.8
* Update sbt-osgi to 0.9.5
* Update dependencies for scala 2.10.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/spray/json/JsonParser.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/spray/json/JsonPrinter.scala | 4 | ||||
| -rw-r--r-- | src/test/scala/spray/json/BasicFormatsSpec.scala | 4 | ||||
| -rw-r--r-- | src/test/scala/spray/json/ProductFormatsSpec.scala | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/main/scala/spray/json/JsonParser.scala b/src/main/scala/spray/json/JsonParser.scala index 3efdac8..7dfae0a 100644 --- a/src/main/scala/spray/json/JsonParser.scala +++ b/src/main/scala/spray/json/JsonParser.scala @@ -231,7 +231,7 @@ class JsonParser(input: ParserInput, settings: JsonParserSettings = JsonParserSe s"Unexpected $unexpected at input index $cursor (line $lineNr, position $col), expected $expected" } val detail = { - val sanitizedText = text.map(c ⇒ if (Character.isISOControl(c)) '?' else c) + val sanitizedText = text.map(c => if (Character.isISOControl(c)) '?' else c) s"\n$sanitizedText\n${" " * (col-1)}^\n" } throw new ParsingException(summary, detail) diff --git a/src/main/scala/spray/json/JsonPrinter.scala b/src/main/scala/spray/json/JsonPrinter.scala index f132ab9..42cbab4 100644 --- a/src/main/scala/spray/json/JsonPrinter.scala +++ b/src/main/scala/spray/json/JsonPrinter.scala @@ -59,8 +59,8 @@ trait JsonPrinter extends (JsValue => String) { sb.append('"') firstToBeEncoded() match { - case -1 ⇒ sb.append(s) - case first ⇒ + case -1 => sb.append(s) + case first => sb.append(s, 0, first) @tailrec def append(ix: Int): Unit = if (ix < s.length) { diff --git a/src/test/scala/spray/json/BasicFormatsSpec.scala b/src/test/scala/spray/json/BasicFormatsSpec.scala index 8417df2..454e1cc 100644 --- a/src/test/scala/spray/json/BasicFormatsSpec.scala +++ b/src/test/scala/spray/json/BasicFormatsSpec.scala @@ -158,10 +158,10 @@ class BasicFormatsSpec extends Specification with DefaultJsonProtocol { "The SymbolJsonFormat" should { "convert a Symbol to a JsString" in { - 'Hello.toJson mustEqual JsString("Hello") + Symbol("Hello").toJson mustEqual JsString("Hello") } "convert a JsString to a Symbol" in { - JsString("Hello").convertTo[Symbol] mustEqual 'Hello + JsString("Hello").convertTo[Symbol] mustEqual Symbol("Hello") } } diff --git a/src/test/scala/spray/json/ProductFormatsSpec.scala b/src/test/scala/spray/json/ProductFormatsSpec.scala index 9eabc50..f42c46d 100644 --- a/src/test/scala/spray/json/ProductFormatsSpec.scala +++ b/src/test/scala/spray/json/ProductFormatsSpec.scala @@ -65,7 +65,7 @@ class ProductFormatsSpec extends Specification { Test2(42, None).toJson mustEqual JsObject("a" -> JsNumber(42)) } "ignore additional members during deserialization" in { - JsObject("a" -> JsNumber(42), "b" -> JsNumber(4.2), "c" -> JsString('no)).convertTo[Test2] mustEqual obj + JsObject("a" -> JsNumber(42), "b" -> JsNumber(4.2), "c" -> JsString(Symbol("no"))).convertTo[Test2] mustEqual obj } "not depend on any specific member order for deserialization" in { JsObject("b" -> JsNumber(4.2), "a" -> JsNumber(42)).convertTo[Test2] mustEqual obj |