Merge pull request #41 from adam-singer/adam-singer/clean-up-imports-and-paths

Clean up imports and benchmark NPE exception on path

Author: retronym

compilation/src/main/scala/scala/tools/nsc/HotSbtBenchmark.scala

@@ -1,17 +1,12 @@
 package scala.tools.nsc
 
 import java.io._
-import java.net.URL
 import java.nio.file._
-import java.nio.file.attribute.BasicFileAttributes
 import java.util.concurrent.TimeUnit
 
-import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations.Mode.SampleTime
 import org.openjdk.jmh.annotations._
 
-import scala.collection.JavaConverters._
-
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(SampleTime))
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
@@ -166,4 +161,4 @@ class HotSbtBenchmark {
     BenchmarkUtils.deleteRecursive(tempDir)
     BenchmarkUtils.deleteRecursive(scalaHome)
   }
-}
+}

compilation/src/main/scala/scala/tools/nsc/JavacBenchmark.java

@@ -1,21 +1,16 @@
 package scala.tools.nsc;
 
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-
-import javax.tools.JavaCompiler;
-import javax.tools.ToolProvider;
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
+import javax.tools.JavaCompiler;
+import javax.tools.ToolProvider;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
 
 @State(Scope.Thread)
 public class JavacBenchmark {

compilation/src/main/scala/scala/tools/nsc/ScalacBenchmark.scala

@@ -1,17 +1,13 @@
 package scala.tools.nsc
 
-import java.io.{File, IOException}
-import java.net.URL
+import java.io.File
 import java.nio.file._
-import java.nio.file.attribute.BasicFileAttributes
 import java.util.concurrent.TimeUnit
 import java.util.stream.Collectors
 
-import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations.Mode._
 import org.openjdk.jmh.annotations._
 
-import scala.collection.JavaConverters._
 import scala.tools.benchmark.BenchmarkDriver
 
 trait BaseBenchmarkDriver {

infrastructure/src/main/java/scala/bench/Database.java

@@ -1,25 +1,22 @@
 package scala.bench;
 
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-import okhttp3.Credentials;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
-import org.influxdb.InfluxDB;
-import org.influxdb.InfluxDBFactory;
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.stream.Stream;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+
+import org.influxdb.InfluxDB;
+import org.influxdb.InfluxDBFactory;
+
+import okhttp3.Credentials;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+
 public class Database {
 
     public static InfluxDB connectDb() {

micro/src/main/scala/scala/tools/nsc/TreeTransformerBenchmark.scala

@@ -17,7 +17,7 @@ class TreeTransformerBenchmark {
   var g: Global = _
   var tree: Global#Tree = _
 
-  @Param(Array("../corpus/vector/Vector.scala"))
+  @Param(Array("../corpus/vector/latest/Vector.scala"))
   var file: String = _
 
   @Setup def setup(): Unit = {

micro/src/main/scala/scala/tools/nsc/TreeTraverserBenchmark.scala

@@ -16,7 +16,7 @@ import scala.reflect.internal.util.BatchSourceFile
 class TreeTraverserBenchmark {
   var g: Global = _
   var tree: Global#Tree = _
-  @Param(Array("../corpus/vector/Vector.scala"))
+  @Param(Array("../corpus/vector/latest/Vector.scala"))
   var file: String = _
 
   @Setup def setup(): Unit = {