From ae3641cc5ff158bec2cbf1d83ce8b5ef2e51decc Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Thu, 5 Jul 2018 22:38:41 +0900 Subject: [PATCH] fix procedure syntax procedure syntax is deprecated https://github.com/scala/scala/commit/1d4d901fcea0a162cd139836b246e85cc0130a6b --- .../src/main/scala/scoverage/plugin.scala | 6 +++--- .../src/test/scala/scoverage/CoberturaXmlWriterTest.scala | 6 +++--- .../src/test/scala/scoverage/LocationCompiler.scala | 2 +- .../src/test/scala/scoverage/ScoverageCompiler.scala | 2 +- .../js/src/main/scala/scalajssupport/JsFile.scala | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/plugin.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/plugin.scala index b8416c72..fa9bd3ea 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/plugin.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/plugin.scala @@ -18,7 +18,7 @@ class ScoveragePlugin(val global: Global) extends Plugin { val instrumentationComponent = new ScoverageInstrumentationComponent(global, extraAfterPhase, extraBeforePhase) override val components: List[PluginComponent] = List(instrumentationComponent) - override def processOptions(opts: List[String], error: String => Unit) { + override def processOptions(opts: List[String], error: String => Unit): Unit = { val options = new ScoverageOptions for (opt <- opts) { if (opt.startsWith("excludedPackages:")) { @@ -227,7 +227,7 @@ class ScoverageInstrumentationComponent(val global: Global, extraAfterPhase: Opt def isStatementIncluded(pos: Position): Boolean = coverageFilter.isLineIncluded(pos) def isSymbolIncluded(symbol: Symbol): Boolean = coverageFilter.isSymbolIncluded(symbol.fullNameString) - def updateLocation(t: Tree) { + def updateLocation(t: Tree): Unit = { Location(global)(t) match { case Some(loc) => this.location = loc case _ => reporter.warning(t.pos, s"[warn] Cannot update location for $t") @@ -259,7 +259,7 @@ class ScoverageInstrumentationComponent(val global: Global, extraAfterPhase: Opt ) } - def debug(t: Tree) { + def debug(t: Tree): Unit = { import scala.reflect.runtime.{universe => u} reporter.echo(t.getClass.getSimpleName + ": LINE " + safeLine(t) + ": " + u.showRaw(t)) } diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/CoberturaXmlWriterTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/CoberturaXmlWriterTest.scala index 9887c76f..6a21fac3 100644 --- a/scalac-scoverage-plugin/src/test/scala/scoverage/CoberturaXmlWriterTest.scala +++ b/scalac-scoverage-plugin/src/test/scala/scoverage/CoberturaXmlWriterTest.scala @@ -65,16 +65,16 @@ class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstan val builder = domFactory.newDocumentBuilder() builder.setErrorHandler(new ErrorHandler() { @Override - def error(e: SAXParseException) { + def error(e: SAXParseException): Unit = { fail(e) } @Override - def fatalError(e: SAXParseException) { + def fatalError(e: SAXParseException): Unit = { fail(e) } @Override - def warning(e: SAXParseException) { + def warning(e: SAXParseException): Unit = { fail(e) } }) diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/LocationCompiler.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/LocationCompiler.scala index 10c9fd2a..0aede017 100644 --- a/scalac-scoverage-plugin/src/test/scala/scoverage/LocationCompiler.scala +++ b/scalac-scoverage-plugin/src/test/scala/scoverage/LocationCompiler.scala @@ -43,7 +43,7 @@ class LocationCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tools } } - override def computeInternalPhases() { + override def computeInternalPhases(): Unit = { super.computeInternalPhases() addToPhasesSet(locationSetter, "sets locations") } diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala index 6f8ee7eb..75abedbf 100644 --- a/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala +++ b/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala @@ -145,7 +145,7 @@ class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tool } } - override def computeInternalPhases() { + override def computeInternalPhases(): Unit = { super.computeInternalPhases() addToPhasesSet(validator, "scoverage validator") addToPhasesSet(instrumentationComponent, "scoverage instrumentationComponent") diff --git a/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/JsFile.scala b/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/JsFile.scala index 4adb6f0e..e7b6555b 100644 --- a/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/JsFile.scala +++ b/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/JsFile.scala @@ -26,7 +26,7 @@ trait FileFilter { } trait JsFileObject { - def write(path: String, data: String, mode: String = "a") + def write(path: String, data: String, mode: String = "a"): Unit def pathJoin(path: String, child: String): String def apply(path: String): JsFile }