util: Cleanup compiler warnings

There are a lot of warnings when compiling util,
this fixes many of them.

RB_ID=739494

2 files changed, 16 insertions, 20 deletions

diff --git a/libraries/eval/Eval.scala b/libraries/eval/Eval.scala
index 7e5fb71..8b03ec6 100644
--- a/libraries/eval/Eval.scala
+++ b/libraries/eval/Eval.scala
@@ -16,24 +16,23 @@
 
 package com.twitter.util
 
+import com.twitter.conversions.string._
+import com.twitter.io.StreamIO
 import java.io._
 import java.math.BigInteger
 import java.net.URLClassLoader
 import java.security.MessageDigest
 import java.util.Random
 import java.util.jar.JarFile
-
 import scala.collection.mutable
 import scala.io.Source
+import scala.reflect.internal.util.{BatchSourceFile, Position}
 import scala.tools.nsc.interpreter.AbstractFileClassLoader
 import scala.tools.nsc.io.{AbstractFile, VirtualDirectory}
 import scala.tools.nsc.reporters.{Reporter, AbstractReporter}
-import scala.tools.nsc.util.{BatchSourceFile, Position}
 import scala.tools.nsc.{Global, Settings}
 import scala.util.matching.Regex
 
-import com.twitter.conversions.string._
-import com.twitter.io.StreamIO
 
 /**
  * Evaluate a file or string and return the result.
@@ -132,7 +131,7 @@ class Eval(target: Option[File]) {
   def writeChecksum(checksum: String, file: File) {
     val writer = new FileWriter(file)
     writer.write("%s".format(checksum))
-    writer.close
+    writer.close()
   }
 
   /**
@@ -154,7 +153,7 @@ class Eval(target: Option[File]) {
       val sourceChecksum = uniqueId(processed, None)
       val checksumFile = new File(targetDir, "checksum")
       val lastChecksum = if (checksumFile.exists) {
-        Source.fromFile(checksumFile).getLines.take(1).toList.head
+        Source.fromFile(checksumFile).getLines().take(1).toList.head
       } else {
         -1
       }
@@ -519,12 +518,12 @@ class Eval(target: Option[File]) {
     def reset() {
       targetDir match {
         case None => {
-          target.asInstanceOf[VirtualDirectory].clear
+          target.asInstanceOf[VirtualDirectory].clear()
         }
         case Some(t) => {
           target.foreach { abstractFile =>
             if (abstractFile.file == null || abstractFile.file.getName.endsWith(".class")) {
-              abstractFile.delete
+              abstractFile.delete()
             }
           }
         }
diff --git a/libraries/eval/test/EvalTest.scala b/libraries/eval/test/EvalTest.scala
index e53dc47..ad621f0 100644
--- a/libraries/eval/test/EvalTest.scala
+++ b/libraries/eval/test/EvalTest.scala
@@ -1,18 +1,15 @@
 package com.twitter.util
 
+import com.twitter.io.TempFile
 import java.io.{File, FileWriter}
-
-import scala.io.Source
-
 import org.junit.runner.RunWith
-import org.scalatest.DiagrammedAssertions._
 import org.scalatest.WordSpec
 import org.scalatest.junit.JUnitRunner
-
-import com.twitter.io.TempFile
-import scala.tools.nsc.reporters.{AbstractReporter, Reporter}
+import scala.io.Source
+import scala.language.reflectiveCalls
+import scala.reflect.internal.util.Position
 import scala.tools.nsc.Settings
-import scala.tools.nsc.util.Position
+import scala.tools.nsc.reporters.{AbstractReporter, Reporter}
 
 @RunWith(classOf[JUnitRunner])
 class EvalTest extends WordSpec {
@@ -42,7 +39,7 @@ class EvalTest extends WordSpec {
       val res: String = e(sourceFile)
       assert(res == "hello")
       val className = e.fileToClassName(sourceFile)
-      val processedSource = e.sourceForString(Source.fromFile(sourceFile).getLines.mkString("\n"))
+      val processedSource = e.sourceForString(Source.fromFile(sourceFile).getLines().mkString("\n"))
       val fullClassName = "Evaluator__%s_%s.class".format(
         className, e.uniqueId(processedSource, None))
       val targetFileName = f.getAbsolutePath() + File.separator + fullClassName
@@ -61,7 +58,7 @@ class EvalTest extends WordSpec {
 
       // make sure it created a class file with the expected name
       val className = e.fileToClassName(sourceFile)
-      val processedSource = e.sourceForString(Source.fromFile(sourceFile).getLines.mkString("\n"))
+      val processedSource = e.sourceForString(Source.fromFile(sourceFile).getLines().mkString("\n"))
       val fullClassName = "Evaluator__%s_%s.class".format(
         className, e.uniqueId(processedSource, None))
       val targetFileName = f.getAbsolutePath() + File.separator + fullClassName
@@ -90,7 +87,7 @@ class EvalTest extends WordSpec {
       // append a newline, altering checksum, verify recompile
       val writer = new FileWriter(sourceFile)
       writer.write("//a comment\n2\n")
-      writer.close
+      writer.close()
       val res4: Int = e(sourceFile)
       assert(res4 == 2)
       // and make sure it created a new file
@@ -180,7 +177,7 @@ class EvalTest extends WordSpec {
             override val settings: Settings = compilerSettings
             override def displayPrompt(): Unit = ()
             override def display(pos: Position, msg: String, severity: this.type#Severity): Unit = {
-              errors = errors :+ (msg, severity.toString)
+              errors = errors :+ ((msg, severity.toString))
             }
             override def reset() = {
               super.reset()