From 3c1523b6c3ae011cc84fadcd995d4438f20679f2 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Mon, 9 Apr 2018 17:19:45 +0900
Subject: [PATCH] add -Xfuture option. fix procedure syntax warnings

---
 build.sbt                                     |  2 +-
 jvm/src/test/scala/scala/xml/XMLTest.scala    |  2 +-
 .../scala/xml/pull/XMLEventReaderTest.scala   |  2 +-
 .../src/main/scala/scala/xml/Attribute.scala  |  2 +-
 .../scala/scala/xml/NamespaceBinding.scala    |  4 +--
 .../main/scala/scala/xml/PrettyPrinter.scala  | 10 +++---
 shared/src/main/scala/scala/xml/Utility.scala |  2 +-
 shared/src/main/scala/scala/xml/XML.scala     |  2 +-
 .../scala/scala/xml/dtd/ContentModel.scala    |  2 +-
 .../src/main/scala/scala/xml/dtd/Decl.scala   |  2 +-
 .../scala/xml/dtd/ElementValidator.scala      |  2 +-
 .../main/scala/scala/xml/dtd/Scanner.scala    |  8 ++---
 .../xml/dtd/impl/SubsetConstruction.scala     |  4 +--
 .../scala/xml/dtd/impl/WordBerrySethi.scala   |  6 ++--
 .../scala/xml/include/XIncludeException.scala |  2 +-
 .../xml/include/sax/XIncludeFilter.scala      | 26 +++++++-------
 .../scala/xml/include/sax/XIncluder.scala     | 36 +++++++++----------
 .../scala/xml/parsing/FactoryAdapter.scala    |  2 +-
 .../scala/xml/parsing/MarkupHandler.scala     |  2 +-
 .../scala/xml/parsing/MarkupParser.scala      | 24 ++++++-------
 .../xml/parsing/MarkupParserCommon.scala      |  6 ++--
 .../xml/parsing/ValidatingMarkupHandler.scala | 14 ++++----
 .../scala/scala/xml/pull/XMLEventReader.scala |  6 ++--
 shared/src/test/scala/scala/xml/XMLTest.scala |  8 ++---
 24 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/build.sbt b/build.sbt
index e35bd9747..1a8017cb3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -22,7 +22,7 @@ lazy val xml = crossProject.in(file("."))
     name    := "scala-xml",
     version := "1.1.1-SNAPSHOT",
 
-    scalacOptions         ++= "-deprecation:false -feature -Xlint:-stars-align,-nullary-unit,_".split("\\s+").to[Seq],
+    scalacOptions         ++= "-deprecation:false -Xfuture -feature -Xlint:-stars-align,-nullary-unit,_".split("\\s+").to[Seq],
     scalacOptions in Test  += "-Xxml:coalescing",
 
     apiMappings ++= Map(
diff --git a/jvm/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala
index 60ca3bc73..fac1c9362 100644
--- a/jvm/src/test/scala/scala/xml/XMLTest.scala
+++ b/jvm/src/test/scala/scala/xml/XMLTest.scala
@@ -199,7 +199,7 @@ class XMLTestJVM {
         new java.io.ObjectInputStream(new java.io.ByteArrayInputStream(buffer))
       in.readObject().asInstanceOf[A]
     }
-    def check[A, B](x: A, y: B) {
+    def check[A, B](x: A, y: B): Unit = {
       // println("x = " + x)
       // println("y = " + y)
       // println("x equals y: " + (x equals y) + ", y equals x: " + (y equals x))
diff --git a/jvm/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala b/jvm/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
index 49df7d56f..0c869d4f5 100644
--- a/jvm/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
+++ b/jvm/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
@@ -13,7 +13,7 @@ class XMLEventReaderTest {
 
   private def toSource(s: String) = new Source {
     val iter = s.iterator
-    override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err) {}
+    override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err): Unit = {}
   }
 
   @Test
diff --git a/shared/src/main/scala/scala/xml/Attribute.scala b/shared/src/main/scala/scala/xml/Attribute.scala
index 271d6c198..d8ca107fb 100644
--- a/shared/src/main/scala/scala/xml/Attribute.scala
+++ b/shared/src/main/scala/scala/xml/Attribute.scala
@@ -88,7 +88,7 @@ abstract trait Attribute extends MetaData {
   /**
    * Appends string representation of only this attribute to stringbuffer.
    */
-  protected def toString1(sb: StringBuilder) {
+  protected def toString1(sb: StringBuilder): Unit = {
     if (value == null)
       return
     if (isPrefixed)
diff --git a/shared/src/main/scala/scala/xml/NamespaceBinding.scala b/shared/src/main/scala/scala/xml/NamespaceBinding.scala
index ae97ac50d..7bc2ca43d 100644
--- a/shared/src/main/scala/scala/xml/NamespaceBinding.scala
+++ b/shared/src/main/scala/scala/xml/NamespaceBinding.scala
@@ -67,11 +67,11 @@ case class NamespaceBinding(prefix: String, uri: String, parent: NamespaceBindin
 
   def buildString(stop: NamespaceBinding): String = sbToString(buildString(_, stop))
 
-  def buildString(sb: StringBuilder, stop: NamespaceBinding) {
+  def buildString(sb: StringBuilder, stop: NamespaceBinding): Unit = {
     shadowRedefined(stop).doBuildString(sb, stop)
   }
 
-  private def doBuildString(sb: StringBuilder, stop: NamespaceBinding) {
+  private def doBuildString(sb: StringBuilder, stop: NamespaceBinding): Unit = {
     if (List(null, stop, TopScope).contains(this)) return
 
     val s = " xmlns%s=\"%s\"".format(
diff --git a/shared/src/main/scala/scala/xml/PrettyPrinter.scala b/shared/src/main/scala/scala/xml/PrettyPrinter.scala
index 2669dbe18..6cb3f6cdb 100755
--- a/shared/src/main/scala/scala/xml/PrettyPrinter.scala
+++ b/shared/src/main/scala/scala/xml/PrettyPrinter.scala
@@ -95,7 +95,7 @@ class PrettyPrinter(width: Int, step: Int, minimizeEmpty: Boolean) {
   }
 
   protected def leafTag(n: Node) = {
-    def mkLeaf(sb: StringBuilder) {
+    def mkLeaf(sb: StringBuilder): Unit = {
       sb append '<'
       n nameToString sb
       n.attributes buildString sb
@@ -106,7 +106,7 @@ class PrettyPrinter(width: Int, step: Int, minimizeEmpty: Boolean) {
 
   protected def startTag(n: Node, pscope: NamespaceBinding): (String, Int) = {
     var i = 0
-    def mkStart(sb: StringBuilder) {
+    def mkStart(sb: StringBuilder): Unit = {
       sb append '<'
       n nameToString sb
       i = sb.length + 1
@@ -118,7 +118,7 @@ class PrettyPrinter(width: Int, step: Int, minimizeEmpty: Boolean) {
   }
 
   protected def endTag(n: Node) = {
-    def mkEnd(sb: StringBuilder) {
+    def mkEnd(sb: StringBuilder): Unit = {
       sb append "</"
       n nameToString sb
       sb append '>'
@@ -203,11 +203,11 @@ class PrettyPrinter(width: Int, step: Int, minimizeEmpty: Boolean) {
    * @param n    the node to be serialized
    * @param sb   the stringbuffer to append to
    */
-  def format(n: Node, sb: StringBuilder) { // entry point
+  def format(n: Node, sb: StringBuilder): Unit = { // entry point
     format(n, TopScope, sb)
   }
 
-  def format(n: Node, pscope: NamespaceBinding, sb: StringBuilder) { // entry point
+  def format(n: Node, pscope: NamespaceBinding, sb: StringBuilder): Unit = { // entry point
     var lastwasbreak = false
     reset()
     traverse(n, pscope, 0)
diff --git a/shared/src/main/scala/scala/xml/Utility.scala b/shared/src/main/scala/scala/xml/Utility.scala
index f7290ed1b..ce14fbc85 100755
--- a/shared/src/main/scala/scala/xml/Utility.scala
+++ b/shared/src/main/scala/scala/xml/Utility.scala
@@ -138,7 +138,7 @@ object Utility extends AnyRef with parsing.TokenTests {
   /**
    * Adds all namespaces in node to set.
    */
-  def collectNamespaces(n: Node, set: mutable.Set[String]) {
+  def collectNamespaces(n: Node, set: mutable.Set[String]): Unit = {
     if (n.doCollectNamespaces) {
       set += n.namespace
       for (a <- n.attributes) a match {
diff --git a/shared/src/main/scala/scala/xml/XML.scala b/shared/src/main/scala/scala/xml/XML.scala
index 092a76889..0b99ca816 100755
--- a/shared/src/main/scala/scala/xml/XML.scala
+++ b/shared/src/main/scala/scala/xml/XML.scala
@@ -107,7 +107,7 @@ object XML extends XMLLoader[Elem] {
    *  @param xmlDecl  if true, write xml declaration
    *  @param doctype  if not null, write doctype declaration
    */
-  final def write(w: java.io.Writer, node: Node, enc: String, xmlDecl: Boolean, doctype: dtd.DocType, minimizeTags: MinimizeMode.Value = MinimizeMode.Default) {
+  final def write(w: java.io.Writer, node: Node, enc: String, xmlDecl: Boolean, doctype: dtd.DocType, minimizeTags: MinimizeMode.Value = MinimizeMode.Default): Unit = {
     /* TODO: optimize by giving writer parameter to toXML*/
     if (xmlDecl) w.write("<?xml version='1.0' encoding='" + enc + "'?>\n")
     if (doctype ne null) w.write(doctype.toString() + "\n")
diff --git a/shared/src/main/scala/scala/xml/dtd/ContentModel.scala b/shared/src/main/scala/scala/xml/dtd/ContentModel.scala
index 97c8c36d5..32d07c6c1 100644
--- a/shared/src/main/scala/scala/xml/dtd/ContentModel.scala
+++ b/shared/src/main/scala/scala/xml/dtd/ContentModel.scala
@@ -54,7 +54,7 @@ object ContentModel extends WordExp {
   def buildString(r: RegExp): String = sbToString(buildString(r, _))
 
   /* precond: rs.length >= 1 */
-  private def buildString(rs: Seq[RegExp], sb: StringBuilder, sep: Char) {
+  private def buildString(rs: Seq[RegExp], sb: StringBuilder, sep: Char): Unit = {
     buildString(rs.head, sb)
     for (z <- rs.tail) {
       sb append sep
diff --git a/shared/src/main/scala/scala/xml/dtd/Decl.scala b/shared/src/main/scala/scala/xml/dtd/Decl.scala
index 5348349df..b8cd9209c 100644
--- a/shared/src/main/scala/scala/xml/dtd/Decl.scala
+++ b/shared/src/main/scala/scala/xml/dtd/Decl.scala
@@ -103,7 +103,7 @@ sealed abstract class EntityDef {
 }
 
 case class IntDef(value: String) extends EntityDef {
-  private def validateValue() {
+  private def validateValue(): Unit = {
     var tmp = value
     var ix = tmp indexOf '%'
     while (ix != -1) {
diff --git a/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala b/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala
index 7dd2700a9..4d5ff979d 100644
--- a/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala
+++ b/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala
@@ -45,7 +45,7 @@ class ElementValidator() extends Function1[Node, Boolean] {
   def getContentModel = contentModel
 
   /** set meta data, enabling attribute validation */
-  def setMetaData(adecls: List[AttrDecl]) { this.adecls = adecls }
+  def setMetaData(adecls: List[AttrDecl]): Unit = { this.adecls = adecls }
 
   def getIterable(nodes: Seq[Node], skipPCDATA: Boolean): Iterable[ElemName] = {
     def isAllWhitespace(a: Atom[_]) = cond(a.data) { case s: String if s.trim == "" => true }
diff --git a/shared/src/main/scala/scala/xml/dtd/Scanner.scala b/shared/src/main/scala/scala/xml/dtd/Scanner.scala
index e9f4f6595..24160cddc 100644
--- a/shared/src/main/scala/scala/xml/dtd/Scanner.scala
+++ b/shared/src/main/scala/scala/xml/dtd/Scanner.scala
@@ -25,7 +25,7 @@ class Scanner extends Tokens with parsing.TokenTests {
   private var c: Char = 'z'
 
   /** initializes the scanner on input s */
-  final def initScanner(s: String) {
+  final def initScanner(s: String): Unit = {
     value = ""
     it = (s).iterator
     token = 1 + END
@@ -34,7 +34,7 @@ class Scanner extends Tokens with parsing.TokenTests {
   }
 
   /** scans the next token */
-  final def nextToken() {
+  final def nextToken(): Unit = {
     if (token != END) token = readToken
   }
 
@@ -44,11 +44,11 @@ class Scanner extends Tokens with parsing.TokenTests {
 
   final def next() = if (it.hasNext) c = it.next() else c = ENDCH
 
-  final def acc(d: Char) {
+  final def acc(d: Char): Unit = {
     if (c == d) next() else scala.sys.error("expected '" + d + "' found '" + c + "' !")
   }
 
-  final def accS(ds: Seq[Char]) { ds foreach acc }
+  final def accS(ds: Seq[Char]): Unit = { ds foreach acc }
 
   final def readToken: Int =
     if (isSpace(c)) {
diff --git a/shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala b/shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala
index 7f7fd9373..6b74839fd 100644
--- a/shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala
+++ b/shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala
@@ -36,11 +36,11 @@ private[dtd] class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T])
 
     rest.push(sink, q0)
 
-    def addFinal(q: immutable.BitSet) {
+    def addFinal(q: immutable.BitSet): Unit = {
       if (nfa containsFinal q)
         finals = finals.updated(q, selectTag(q, nfa.finals))
     }
-    def add(Q: immutable.BitSet) {
+    def add(Q: immutable.BitSet): Unit = {
       if (!states(Q)) {
         states += Q
         rest push Q
diff --git a/shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala b/shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala
index 7cfb7ae35..e96cd1299 100644
--- a/shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala
+++ b/shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala
@@ -73,7 +73,7 @@ private[dtd] abstract class WordBerrySethi extends BaseBerrySethi {
    */
 
   /** Called at the leaves of the regexp */
-  protected def seenLabel(r: RegExp, i: Int, label: _labelT) {
+  protected def seenLabel(r: RegExp, i: Int, label: _labelT): Unit = {
     labelAt = labelAt.updated(i, label)
     this.labels += label
   }
@@ -92,7 +92,7 @@ private[dtd] abstract class WordBerrySethi extends BaseBerrySethi {
     case _               => super.traverse(r)
   }
 
-  protected def makeTransition(src: Int, dest: Int, label: _labelT) {
+  protected def makeTransition(src: Int, dest: Int, label: _labelT): Unit = {
     val q = deltaq(src)
     q.update(label, dest :: q.getOrElse(label, Nil))
   }
@@ -109,7 +109,7 @@ private[dtd] abstract class WordBerrySethi extends BaseBerrySethi {
     this.initials = Set(0)
   }
 
-  protected def initializeAutom() {
+  protected def initializeAutom(): Unit = {
     finals = immutable.Map.empty[Int, Int] // final states
     deltaq = new Array[mutable.HashMap[_labelT, List[Int]]](pos) // delta
     defaultq = new Array[List[Int]](pos) // default transitions
diff --git a/shared/src/main/scala/scala/xml/include/XIncludeException.scala b/shared/src/main/scala/scala/xml/include/XIncludeException.scala
index d91bcc1ab..4b684ffef 100644
--- a/shared/src/main/scala/scala/xml/include/XIncludeException.scala
+++ b/shared/src/main/scala/scala/xml/include/XIncludeException.scala
@@ -39,7 +39,7 @@ class XIncludeException(message: String) extends Exception(message) {
    * @param   nestedException   the underlying exception which
    * caused the XIncludeException to be thrown
    */
-  def setRootCause(nestedException: Throwable) {
+  def setRootCause(nestedException: Throwable): Unit = {
     this.rootCause = nestedException
   }
 
diff --git a/shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala b/shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala
index 997152feb..770d1025b 100644
--- a/shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala
+++ b/shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala
@@ -86,7 +86,7 @@ class XIncludeFilter extends XMLFilterImpl {
   // what if this isn't called????
   // do I need to check this in startDocument() and push something
   // there????
-  override def setDocumentLocator(locator: Locator) {
+  override def setDocumentLocator(locator: Locator): Unit = {
     locators push locator
     val base = locator.getSystemId()
     try {
@@ -113,7 +113,7 @@ class XIncludeFilter extends XMLFilterImpl {
    */
   def insideIncludeElement(): Boolean = level != 0
 
-  override def startElement(uri: String, localName: String, qName: String, atts1: Attributes) {
+  override def startElement(uri: String, localName: String, qName: String, atts1: Attributes): Unit = {
     var atts = atts1
     if (level == 0) { // We're not inside an xi:include element
 
@@ -169,7 +169,7 @@ class XIncludeFilter extends XMLFilterImpl {
     }
   }
 
-  override def endElement(uri: String, localName: String, qName: String) {
+  override def endElement(uri: String, localName: String, qName: String): Unit = {
     if (uri.equals(XINCLUDE_NAMESPACE)
       && localName.equals("include")) {
       level -= 1
@@ -181,13 +181,13 @@ class XIncludeFilter extends XMLFilterImpl {
 
   private var depth = 0
 
-  override def startDocument() {
+  override def startDocument(): Unit = {
     level = 0
     if (depth == 0) super.startDocument()
     depth += 1
   }
 
-  override def endDocument() {
+  override def endDocument(): Unit = {
     locators.pop()
     bases.pop() // pop the URL for the document itself
     depth -= 1
@@ -195,27 +195,27 @@ class XIncludeFilter extends XMLFilterImpl {
   }
 
   // how do prefix mappings move across documents????
-  override def startPrefixMapping(prefix: String, uri: String) {
+  override def startPrefixMapping(prefix: String, uri: String): Unit = {
     if (level == 0) super.startPrefixMapping(prefix, uri)
   }
 
-  override def endPrefixMapping(prefix: String) {
+  override def endPrefixMapping(prefix: String): Unit = {
     if (level == 0) super.endPrefixMapping(prefix)
   }
 
-  override def characters(ch: Array[Char], start: Int, length: Int) {
+  override def characters(ch: Array[Char], start: Int, length: Int): Unit = {
     if (level == 0) super.characters(ch, start, length)
   }
 
-  override def ignorableWhitespace(ch: Array[Char], start: Int, length: Int) {
+  override def ignorableWhitespace(ch: Array[Char], start: Int, length: Int): Unit = {
     if (level == 0) super.ignorableWhitespace(ch, start, length)
   }
 
-  override def processingInstruction(target: String, data: String) {
+  override def processingInstruction(target: String, data: String): Unit = {
     if (level == 0) super.processingInstruction(target, data)
   }
 
-  override def skippedEntity(name: String) {
+  override def skippedEntity(name: String): Unit = {
     if (level == 0) super.skippedEntity(name)
   }
 
@@ -252,7 +252,7 @@ class XIncludeFilter extends XMLFilterImpl {
    * be downloaded from the specified URL
    * or if the encoding is not recognized
    */
-  private def includeTextDocument(url: String, encoding1: String) {
+  private def includeTextDocument(url: String, encoding1: String): Unit = {
     var encoding = encoding1
     if (encoding == null || encoding.trim().equals("")) encoding = "UTF-8"
     var source: URL = null
@@ -318,7 +318,7 @@ class XIncludeFilter extends XMLFilterImpl {
    * @throws SAXException if the requested document cannot
    * be downloaded from the specified URL.
    */
-  private def includeXMLDocument(url: String) {
+  private def includeXMLDocument(url: String): Unit = {
     val source =
       try new URL(bases.peek(), url)
       catch {
diff --git a/shared/src/main/scala/scala/xml/include/sax/XIncluder.scala b/shared/src/main/scala/scala/xml/include/sax/XIncluder.scala
index ee8375cbf..dfc9408ba 100644
--- a/shared/src/main/scala/scala/xml/include/sax/XIncluder.scala
+++ b/shared/src/main/scala/scala/xml/include/sax/XIncluder.scala
@@ -25,9 +25,9 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
 
   var out = new OutputStreamWriter(outs, encoding)
 
-  def setDocumentLocator(locator: Locator) {}
+  def setDocumentLocator(locator: Locator): Unit = {}
 
-  def startDocument() {
+  def startDocument(): Unit = {
     try {
       out.write("<?xml version='1.0' encoding='"
         + encoding + "'?>\r\n")
@@ -37,7 +37,7 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
     }
   }
 
-  def endDocument() {
+  def endDocument(): Unit = {
     try {
       out.flush()
     } catch {
@@ -46,9 +46,9 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
     }
   }
 
-  def startPrefixMapping(prefix: String, uri: String) {}
+  def startPrefixMapping(prefix: String, uri: String): Unit = {}
 
-  def endPrefixMapping(prefix: String) {}
+  def endPrefixMapping(prefix: String): Unit = {}
 
   def startElement(namespaceURI: String, localName: String, qualifiedName: String, atts: Attributes) = {
     try {
@@ -71,7 +71,7 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
     }
   }
 
-  def endElement(namespaceURI: String, localName: String, qualifiedName: String) {
+  def endElement(namespaceURI: String, localName: String, qualifiedName: String): Unit = {
     try {
       out.write("</" + qualifiedName + ">")
     } catch {
@@ -82,7 +82,7 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
 
   // need to escape characters that are not in the given
   // encoding using character references????
-  def characters(ch: Array[Char], start: Int, length: Int) {
+  def characters(ch: Array[Char], start: Int, length: Int): Unit = {
     try {
       var i = 0; while (i < length) {
         val c = ch(start + i)
@@ -101,12 +101,12 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
     }
   }
 
-  def ignorableWhitespace(ch: Array[Char], start: Int, length: Int) {
+  def ignorableWhitespace(ch: Array[Char], start: Int, length: Int): Unit = {
     this.characters(ch, start, length)
   }
 
   // do I need to escape text in PI????
-  def processingInstruction(target: String, data: String) {
+  def processingInstruction(target: String, data: String): Unit = {
     try {
       out.write("<?" + target + " " + data + "?>")
     } catch {
@@ -115,7 +115,7 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
     }
   }
 
-  def skippedEntity(name: String) {
+  def skippedEntity(name: String): Unit = {
     try {
       out.write("&" + name + ";")
     } catch {
@@ -128,7 +128,7 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
   private var inDTD: Boolean = false
   private val entities = new mutable.Stack[String]()
 
-  def startDTD(name: String, publicID: String, systemID: String) {
+  def startDTD(name: String, publicID: String, systemID: String): Unit = {
     inDTD = true
     // if this is the source document, output a DOCTYPE declaration
     if (entities.isEmpty) {
@@ -143,28 +143,28 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
       }
     }
   }
-  def endDTD() {}
+  def endDTD(): Unit = {}
 
-  def startEntity(name: String) {
+  def startEntity(name: String): Unit = {
     entities push name
   }
 
-  def endEntity(name: String) {
+  def endEntity(name: String): Unit = {
     entities.pop()
   }
 
-  def startCDATA() {}
-  def endCDATA() {}
+  def startCDATA(): Unit = {}
+  def endCDATA(): Unit = {}
 
   // Just need this reference so we can ask if a comment is
   // inside an include element or not
   private var filter: XIncludeFilter = null
 
-  def setFilter(filter: XIncludeFilter) {
+  def setFilter(filter: XIncludeFilter): Unit = {
     this.filter = filter
   }
 
-  def comment(ch: Array[Char], start: Int, length: Int) {
+  def comment(ch: Array[Char], start: Int, length: Int): Unit = {
     if (!inDTD && !filter.insideIncludeElement()) {
       try {
         out.write("<!--")
diff --git a/shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala b/shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala
index f89800907..607a0aace 100644
--- a/shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala
+++ b/shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala
@@ -187,7 +187,7 @@ abstract class FactoryAdapter extends DefaultHandler with factory.XMLLoader[Node
   /**
    * Processing instruction.
    */
-  override def processingInstruction(target: String, data: String) {
+  override def processingInstruction(target: String, data: String): Unit = {
     captureText()
     hStack pushAll createProcInstr(target, data)
   }
diff --git a/shared/src/main/scala/scala/xml/parsing/MarkupHandler.scala b/shared/src/main/scala/scala/xml/parsing/MarkupHandler.scala
index 4e03d9022..d0d8abb1d 100755
--- a/shared/src/main/scala/scala/xml/parsing/MarkupHandler.scala
+++ b/shared/src/main/scala/scala/xml/parsing/MarkupHandler.scala
@@ -121,7 +121,7 @@ abstract class MarkupHandler {
   def parsedEntityDecl(name: String, edef: EntityDef): Unit =
     someEntityDecl(name, edef, ParsedEntityDecl.apply _)
 
-  def peReference(name: String) { decls ::= PEReference(name) }
+  def peReference(name: String): Unit = { decls ::= PEReference(name) }
   def unparsedEntityDecl(name: String, extID: ExternalID, notat: String): Unit = ()
   def notationDecl(notat: String, extID: ExternalID): Unit = ()
   def reportSyntaxError(pos: Int, str: String): Unit
diff --git a/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala b/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala
index 84b63a686..0bea3784e 100755
--- a/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala
+++ b/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala
@@ -294,7 +294,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
     handle.procInstr(position, name, text)
 
   /** this method tells ch to get the next character when next called */
-  def nextch() {
+  def nextch(): Unit = {
     // Read current ch if needed
     ch
 
@@ -415,7 +415,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
    *  '<' content1 ::=  ...
    *  }}}
    */
-  def content1(pscope: NamespaceBinding, ts: NodeBuffer) {
+  def content1(pscope: NamespaceBinding, ts: NodeBuffer): Unit = {
     ch match {
       case '!' =>
         nextch()
@@ -511,7 +511,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
    *  <! parseDTD ::= DOCTYPE name ... >
    *  }}}
    */
-  def parseDTD() { // dirty but fast
+  def parseDTD(): Unit = { // dirty but fast
     var extID: ExternalID = null
     if (this.dtd ne null)
       reportSyntaxError("unexpected character (DOCTYPE already defined")
@@ -776,7 +776,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
   /**
    * "rec-xml/#ExtSubset" pe references may not occur within markup declarations
    */
-  def intSubset() {
+  def intSubset(): Unit = {
     //Console.println("(DEBUG) intSubset()")
     xSpace()
     while (']' != ch && !eof)
@@ -786,7 +786,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
   /**
    * &lt;! element := ELEMENT
    */
-  def elementDecl() {
+  def elementDecl(): Unit = {
     xToken("EMENT")
     xSpace()
     val n = xName
@@ -907,7 +907,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
    *  'N' notationDecl ::= "OTATION"
    *  }}}
    */
-  def notationDecl() {
+  def notationDecl(): Unit = {
     xToken("OTATION")
     xSpace()
     val notat = xName
@@ -935,11 +935,11 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
     handle.notationDecl(notat, extID)
   }
 
-  def reportSyntaxError(pos: Int, str: String) { curInput.reportError(pos, str) }
-  def reportSyntaxError(str: String) { reportSyntaxError(pos, str) }
-  def reportValidationError(pos: Int, str: String) { reportSyntaxError(pos, str) }
+  def reportSyntaxError(pos: Int, str: String): Unit = { curInput.reportError(pos, str) }
+  def reportSyntaxError(str: String): Unit = { reportSyntaxError(pos, str) }
+  def reportValidationError(pos: Int, str: String): Unit = { reportSyntaxError(pos, str) }
 
-  def push(entityName: String) {
+  def push(entityName: String): Unit = {
     if (!eof)
       inpStack = curInput :: inpStack
 
@@ -950,7 +950,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
     nextch()
   }
 
-  def pushExternal(systemId: String) {
+  def pushExternal(systemId: String): Unit = {
     if (!eof)
       inpStack = curInput :: inpStack
 
@@ -961,7 +961,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
     nextch()
   }
 
-  def pop() {
+  def pop(): Unit = {
     curInput = inpStack.head
     inpStack = inpStack.tail
     lastChRead = curInput.ch
diff --git a/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala b/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
index 5b263656e..2685f0632 100644
--- a/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
+++ b/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
@@ -88,7 +88,7 @@ private[scala] trait MarkupParserCommon extends TokenTests {
   /**
    * [42]  '<' xmlEndTag ::=  '<' '/' Name S? '>'
    */
-  def xEndTag(startName: String) {
+  def xEndTag(startName: String): Unit = {
     xToken('/')
     if (xName != startName)
       errorNoEnd(startName)
@@ -199,11 +199,11 @@ private[scala] trait MarkupParserCommon extends TokenTests {
     x
   }
 
-  def xToken(that: Char) {
+  def xToken(that: Char): Unit = {
     if (ch == that) nextch()
     else xHandleError(that, "'%s' expected instead of '%s'".format(that, ch))
   }
-  def xToken(that: Seq[Char]) { that foreach xToken }
+  def xToken(that: Seq[Char]): Unit = { that foreach xToken }
 
   /** scan [S] '=' [S]*/
   def xEQ() = { xSpaceOpt(); xToken('='); xSpaceOpt() }
diff --git a/shared/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala b/shared/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala
index 0efdb99a2..fb1058284 100644
--- a/shared/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala
+++ b/shared/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala
@@ -26,7 +26,7 @@ abstract class ValidatingMarkupHandler extends MarkupHandler {
   override def endDTD(n: String) = {
     rootLabel = n
   }
-  override def elemStart(pos: Int, pre: String, label: String, attrs: MetaData, scope: NamespaceBinding) {
+  override def elemStart(pos: Int, pre: String, label: String, attrs: MetaData, scope: NamespaceBinding): Unit = {
 
     def advanceDFA(dm: DFAContentModel) = {
       val trans = dm.dfa.delta(qCurrent)
@@ -67,7 +67,7 @@ abstract class ValidatingMarkupHandler extends MarkupHandler {
     // println("  done  now")
   }
 
-  override def elemEnd(pos: Int, pre: String, label: String) {
+  override def elemEnd(pos: Int, pre: String, label: String): Unit = {
     // println("  elemEnd")
     qCurrent = qStack.head
     qStack = qStack.tail
@@ -77,23 +77,23 @@ abstract class ValidatingMarkupHandler extends MarkupHandler {
     // println("    declCurrent now" + declCurrent)
   }
 
-  final override def elemDecl(name: String, cmstr: String) {
+  final override def elemDecl(name: String, cmstr: String): Unit = {
     decls = ElemDecl(name, ContentModel.parse(cmstr)) :: decls
   }
 
-  final override def attListDecl(name: String, attList: List[AttrDecl]) {
+  final override def attListDecl(name: String, attList: List[AttrDecl]): Unit = {
     decls = AttListDecl(name, attList) :: decls
   }
 
-  final override def unparsedEntityDecl(name: String, extID: ExternalID, notat: String) {
+  final override def unparsedEntityDecl(name: String, extID: ExternalID, notat: String): Unit = {
     decls = UnparsedEntityDecl(name, extID, notat) :: decls
   }
 
-  final override def notationDecl(notat: String, extID: ExternalID) {
+  final override def notationDecl(notat: String, extID: ExternalID): Unit = {
     decls = NotationDecl(notat, extID) :: decls
   }
 
-  final override def peReference(name: String) {
+  final override def peReference(name: String): Unit = {
     decls = PEReference(name) :: decls
   }
 
diff --git a/shared/src/main/scala/scala/xml/pull/XMLEventReader.scala b/shared/src/main/scala/scala/xml/pull/XMLEventReader.scala
index 8d0a20387..fbec773e6 100755
--- a/shared/src/main/scala/scala/xml/pull/XMLEventReader.scala
+++ b/shared/src/main/scala/scala/xml/pull/XMLEventReader.scala
@@ -69,11 +69,11 @@ class XMLEventReader(src: Source)
       NodeSeq.Empty
     }
 
-    override def elemStart(pos: Int, pre: String, label: String, attrs: MetaData, scope: NamespaceBinding) {
+    override def elemStart(pos: Int, pre: String, label: String, attrs: MetaData, scope: NamespaceBinding): Unit = {
       level += 1
       setEvent(EvElemStart(pre, label, attrs, scope))
     }
-    override def elemEnd(pos: Int, pre: String, label: String) {
+    override def elemEnd(pos: Int, pre: String, label: String): Unit = {
       setEvent(EvElemEnd(pre, label))
       level -= 1
     }
@@ -90,7 +90,7 @@ class XMLEventReader(src: Source)
     def entityRef(pos: Int, n: String) = setEvent(EvEntityRef(n))
     def text(pos: Int, txt: String) = setEvent(EvText(txt))
 
-    override def run() {
+    override def run(): Unit = {
       curInput = input
       try {
         interruptibly { this.initialize.document() }
diff --git a/shared/src/test/scala/scala/xml/XMLTest.scala b/shared/src/test/scala/scala/xml/XMLTest.scala
index 46f21d16f..43366300b 100644
--- a/shared/src/test/scala/scala/xml/XMLTest.scala
+++ b/shared/src/test/scala/scala/xml/XMLTest.scala
@@ -260,7 +260,7 @@ class XMLTest {
   }
 
   @UnitTest
-  def XmlEy {
+  def XmlEy: Unit = {
     assertTrue((ax \ "@{the namespace from outer space}foo") xml_== "baz")
     assertTrue((cx \ "@{the namespace from outer space}foo") xml_== "baz")
 
@@ -416,7 +416,7 @@ Ours is the portal of hope, come as you are."
   }
 
   @UnitTest
-  def t5052 {
+  def t5052: Unit = {
     assertTrue(<elem attr={ null: String }/> xml_== <elem/>)
     assertTrue(<elem attr={ None }/> xml_== <elem/>)
     assertTrue(<elem/> xml_== <elem attr={ null: String }/>)
@@ -438,7 +438,7 @@ Ours is the portal of hope, come as you are."
   }
 
   @UnitTest
-  def t5843 {
+  def t5843: Unit = {
     val foo = scala.xml.Attribute(null, "foo", "1", scala.xml.Null)
     val bar = scala.xml.Attribute(null, "bar", "2", foo)
     val ns = scala.xml.NamespaceBinding(null, "uri", scala.xml.TopScope)
@@ -455,7 +455,7 @@ Ours is the portal of hope, come as you are."
   }
 
   @UnitTest
-  def t7074 {
+  def t7074: Unit = {
     assertEquals("""<a/>""", sort(<a/>) toString)
     assertEquals("""<a b="2" c="3" d="1"/>""", sort(<a d="1" b="2" c="3"/>) toString)
     assertEquals("""<a b="2" c="4" d="1" e="3" f="5"/>""", sort(<a d="1" b="2" e="3" c="4" f="5"/>) toString)