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

fix procedure syntax warnings
eed3si9n · Apr 2, 2018 · f02caa0 · f02caa0
2 parents c44587d + f2cc394
commit f02caa0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/build.sbt b/build.sbt
@@ -63,7 +63,7 @@ lazy val core = project
     commonSettings,
     name := "sjson new core",
     libraryDependencies ++= testDependencies,
-    scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-encoding", "utf8"),
+    scalacOptions ++= Seq("-Xfuture", "-feature", "-language:_", "-unchecked", "-deprecation", "-encoding", "utf8"),
     mimaSettings,
     mimaBinaryIssueFilters ++= Seq(
       // private[this] final val
@@ -78,7 +78,7 @@ def support(n: String) =
       commonSettings,
       name := s"sjson-new-$n",
       libraryDependencies ++= testDependencies,
-      scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-encoding", "utf8"),
+      scalacOptions ++= Seq("-Xfuture", "-feature", "-language:_", "-unchecked", "-deprecation", "-encoding", "utf8"),
       mimaSettings
     )
 

diff --git a/core/src/main/scala/sjsonnew/SimpleFacade.scala b/core/src/main/scala/sjsonnew/SimpleFacade.scala
@@ -37,15 +37,15 @@ trait SimpleBuilderFacade[J] extends BuilderFacade[J] {
   def singleContext() = new FContext[J] {
     var value: J = _
     def addField(s: String): Unit = { value = jstring(s) }
-    def add(v: J) { value = v }
+    def add(v: J): Unit = { value = v }
     def finish: J = value
     def isObj: Boolean = false
   }
 
   def arrayContext() = new FContext[J] {
     val vs = mutable.ListBuffer.empty[J]
     def addField(s: String): Unit = { vs += jstring(s) }
-    def add(v: J) { vs += v }
+    def add(v: J): Unit = { vs += v }
     def finish: J = jarray(vs.toList)
     def isObj: Boolean = false
   }

diff --git a/support/scalajson/src/main/scala/sjsonnew/support/scalajson/unsafe/CompactPrinter.scala b/support/scalajson/src/main/scala/sjsonnew/support/scalajson/unsafe/CompactPrinter.scala
@@ -26,15 +26,15 @@ import shaded.scalajson.ast.unsafe._
  */
 trait CompactPrinter extends JsonPrinter {
 
-  def print(x: JValue, sb: StringBuilder) {
+  def print(x: JValue, sb: StringBuilder): Unit = {
     x match {
       case JObject(x) => printJObject(x, sb)
       case JArray(x)  => printJArray(x, sb)
       case _ => printLeaf(x, sb)
     }
   }
 
-  protected def printJObject(members: Array[JField], sb: StringBuilder) {
+  protected def printJObject(members: Array[JField], sb: StringBuilder): Unit = {
     sb.append('{')
     printArray(members, sb.append(',')) { m =>
       printString(m.field, sb)
@@ -44,7 +44,7 @@ trait CompactPrinter extends JsonPrinter {
     sb.append('}')
   }
 
-  protected def printJArray(elements: Array[JValue], sb: StringBuilder) {
+  protected def printJArray(elements: Array[JValue], sb: StringBuilder): Unit = {
     sb.append('[')
     printArray(elements, sb.append(','))(print(_, sb))
     sb.append(']')

diff --git a/support/scalajson/src/main/scala/sjsonnew/support/scalajson/unsafe/Converter.scala b/support/scalajson/src/main/scala/sjsonnew/support/scalajson/unsafe/Converter.scala
@@ -22,7 +22,7 @@ object Converter extends SupportConverter[JValue] {
       new FContext[JValue] {
         var value: JValue = null
         def addField(s: String): Unit = { value = jstring(s) }
-        def add(v: JValue) { value = v }
+        def add(v: JValue): Unit = { value = v }
         def finish: JValue = value
         def isObj: Boolean = false
       }
@@ -31,7 +31,7 @@ object Converter extends SupportConverter[JValue] {
       new FContext[JValue] {
         val vs = mutable.ArrayBuffer.empty[JValue]
         def addField(s: String): Unit = { vs += jstring(s) }
-        def add(v: JValue) { vs += v }
+        def add(v: JValue): Unit = { vs += v }
         def finish: JValue = JArray(vs.toArray)
         def isObj: Boolean = false
       }

diff --git a/support/scalajson/src/main/scala/sjsonnew/support/scalajson/unsafe/JsonPrinter.scala b/support/scalajson/src/main/scala/sjsonnew/support/scalajson/unsafe/JsonPrinter.scala
@@ -42,9 +42,9 @@ trait JsonPrinter extends (JValue => String) {
     sb.toString
   }
 
-  def print(x: JValue, sb: JStringBuilder)
+  def print(x: JValue, sb: JStringBuilder): Unit
 
-  protected def printLeaf(x: JValue, sb: JStringBuilder) {
+  protected def printLeaf(x: JValue, sb: JStringBuilder): Unit = {
     x match {
       case JNull      => sb.append("null")
       case JTrue      => sb.append("true")
@@ -55,7 +55,7 @@ trait JsonPrinter extends (JValue => 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)
@@ -88,7 +88,7 @@ trait JsonPrinter extends (JValue => String) {
     sb.append('"')
   }
 
-  protected def printArray[A](iterable: Array[A], printSeparator: => Unit)(f: A => Unit) {
+  protected def printArray[A](iterable: Array[A], printSeparator: => Unit)(f: A => Unit): Unit = {
     var first = true
     iterable.foreach { a =>
       if (first) first = false else printSeparator

diff --git a/support/scalajson/src/main/scala/sjsonnew/support/scalajson/unsafe/PrettyPrinter.scala b/support/scalajson/src/main/scala/sjsonnew/support/scalajson/unsafe/PrettyPrinter.scala
@@ -28,19 +28,19 @@ import shaded.scalajson.ast.unsafe._
 trait PrettyPrinter extends JsonPrinter {
   val Indent = 2
 
-  def print(x: JValue, sb: StringBuilder) {
+  def print(x: JValue, sb: StringBuilder): Unit = {
     print(x, sb, 0)
   }
 
-  protected def print(x: JValue, sb: StringBuilder, indent: Int) {
+  protected def print(x: JValue, sb: StringBuilder, indent: Int): Unit = {
     x match {
       case JObject(x) => printJObject(x, sb, indent)
       case JArray(x)  => printJArray(x, sb, indent)
       case _          => printLeaf(x, sb)
     }
   }
 
-  protected def printJObject(members: Array[JField], sb: StringBuilder, indent: Int) {
+  protected def printJObject(members: Array[JField], sb: StringBuilder, indent: Int): Unit = {
     sb.append("{\n")    
     printArray(members, sb.append(",\n")) { m =>
       printIndent(sb, indent + Indent)
@@ -53,13 +53,13 @@ trait PrettyPrinter extends JsonPrinter {
     sb.append("}")
   }
 
-  protected def printJArray(elements: Array[JValue], sb: StringBuilder, indent: Int) {
+  protected def printJArray(elements: Array[JValue], sb: StringBuilder, indent: Int): Unit = {
     sb.append('[')
     printArray(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(' ')