Merge pull request #260 from xuwei-k/procedure-syntax

fix procedure syntax

4 files changed, 13 insertions, 13 deletions

diff --git a/src/main/scala/spray/json/BasicFormats.scala b/src/main/scala/spray/json/BasicFormats.scala
index 65b9ecb..2e6342f 100644
--- a/src/main/scala/spray/json/BasicFormats.scala
+++ b/src/main/scala/spray/json/BasicFormats.scala
@@ -98,7 +98,7 @@ trait BasicFormats {
 
   implicit object UnitJsonFormat extends JsonFormat[Unit] {
     def write(x: Unit) = JsNumber(1)
-    def read(value: JsValue) {}
+    def read(value: JsValue): Unit = {}
   }
 
   implicit object BooleanJsonFormat extends JsonFormat[Boolean] {
diff --git a/src/main/scala/spray/json/CompactPrinter.scala b/src/main/scala/spray/json/CompactPrinter.scala
index a51583d..7260c2f 100644
--- a/src/main/scala/spray/json/CompactPrinter.scala
+++ b/src/main/scala/spray/json/CompactPrinter.scala
@@ -23,7 +23,7 @@ import java.lang.StringBuilder
  */
 trait CompactPrinter extends JsonPrinter {
 
-  def print(x: JsValue, sb: StringBuilder) {
+  def print(x: JsValue, sb: StringBuilder): Unit = {
     x match {
       case JsObject(x) => printObject(x, sb)
       case JsArray(x)  => printArray(x, sb)
@@ -31,7 +31,7 @@ trait CompactPrinter extends JsonPrinter {
     }
   }
 
-  protected def printObject(members: Map[String, JsValue], sb: StringBuilder) {
+  protected def printObject(members: Map[String, JsValue], sb: StringBuilder): Unit = {
     sb.append('{')
     printSeq(members, sb.append(',')) { m =>
       printString(m._1, sb)
@@ -41,7 +41,7 @@ trait CompactPrinter extends JsonPrinter {
     sb.append('}')
   }
 
-  protected def printArray(elements: Seq[JsValue], sb: StringBuilder) {
+  protected def printArray(elements: Seq[JsValue], sb: StringBuilder): Unit = {
     sb.append('[')
     printSeq(elements, sb.append(','))(print(_, sb))
     sb.append(']')
diff --git a/src/main/scala/spray/json/JsonPrinter.scala b/src/main/scala/spray/json/JsonPrinter.scala
index 258fc5a..f132ab9 100644
--- a/src/main/scala/spray/json/JsonPrinter.scala
+++ b/src/main/scala/spray/json/JsonPrinter.scala
@@ -39,9 +39,9 @@ trait JsonPrinter extends (JsValue => String) {
     sb.toString
   }
   
-  def print(x: JsValue, sb: JStringBuilder)
+  def print(x: JsValue, sb: JStringBuilder): Unit
   
-  protected def printLeaf(x: JsValue, sb: JStringBuilder) {
+  protected def printLeaf(x: JsValue, sb: JStringBuilder): Unit = {
     x match {
       case JsNull      => sb.append("null")
       case JsTrue      => sb.append("true")
@@ -52,7 +52,7 @@ trait JsonPrinter extends (JsValue => String) {
     }
   }
 
-  protected def printString(s: String, sb: JStringBuilder) {
+  protected def printString(s: String, sb: JStringBuilder): Unit = {
     import JsonPrinter._
     @tailrec def firstToBeEncoded(ix: Int = 0): Int =
       if (ix == s.length) -1 else if (requiresEncoding(s.charAt(ix))) ix else firstToBeEncoded(ix + 1)
@@ -85,7 +85,7 @@ trait JsonPrinter extends (JsValue => String) {
     sb.append('"')
   }
   
-  protected def printSeq[A](iterable: Iterable[A], printSeparator: => Unit)(f: A => Unit) {
+  protected def printSeq[A](iterable: Iterable[A], printSeparator: => Unit)(f: A => Unit): Unit = {
     var first = true
     iterable.foreach { a =>
       if (first) first = false else printSeparator
diff --git a/src/main/scala/spray/json/PrettyPrinter.scala b/src/main/scala/spray/json/PrettyPrinter.scala
index 6af5443..7526dab 100644
--- a/src/main/scala/spray/json/PrettyPrinter.scala
+++ b/src/main/scala/spray/json/PrettyPrinter.scala
@@ -25,11 +25,11 @@ import annotation.tailrec
 trait PrettyPrinter extends JsonPrinter {
   val Indent = 2
 
-  def print(x: JsValue, sb: StringBuilder) {
+  def print(x: JsValue, sb: StringBuilder): Unit = {
     print(x, sb, 0)
   }
   
-  protected def print(x: JsValue, sb: StringBuilder, indent: Int) {
+  protected def print(x: JsValue, sb: StringBuilder, indent: Int): Unit = {
     x match {
       case JsObject(x) => printObject(x, sb, indent)
       case JsArray(x)  => printArray(x, sb, indent)
@@ -39,7 +39,7 @@ trait PrettyPrinter extends JsonPrinter {
 
   protected def organiseMembers(members: Map[String, JsValue]): Seq[(String, JsValue)] = members.toSeq
 
-  protected def printObject(members: Map[String, JsValue], sb: StringBuilder, indent: Int) {
+  protected def printObject(members: Map[String, JsValue], sb: StringBuilder, indent: Int): Unit = {
     sb.append("{\n")    
     printSeq(organiseMembers(members), sb.append(",\n")) { m =>
       printIndent(sb, indent + Indent)
@@ -52,13 +52,13 @@ trait PrettyPrinter extends JsonPrinter {
     sb.append("}")
   }
   
-  protected def printArray(elements: Seq[JsValue], sb: StringBuilder, indent: Int) {
+  protected def printArray(elements: Seq[JsValue], sb: StringBuilder, indent: Int): Unit = {
     sb.append('[')
     printSeq(elements, sb.append(", "))(print(_, sb, indent))
     sb.append(']')
   }
   
-  protected def printIndent(sb: StringBuilder, indent: Int) {
+  protected def printIndent(sb: StringBuilder, indent: Int): Unit = {
     @tailrec def rec(indent: Int): Unit =
       if (indent > 0) {
         sb.append(' ')