Move vulpix to dotty.tools.vulpix

felixmulder · felixmulder · commit dc92248f7237 · 2017-04-05T20:01:08.000+02:00
diff --git a/compiler/test/dotc/comptest.scala b/compiler/test/dotc/comptest.scala
@@ -1,6 +1,6 @@
 package dotc
 
-import dotty.tools.dotc.vulpix.ParallelTesting
+import dotty.tools.vulpix.ParallelTesting
 
 import scala.concurrent.duration._
 
diff --git a/compiler/test/dotty/tools/vulpix/ChildMain.scala b/compiler/test/dotty/tools/vulpix/ChildMain.scala
@@ -1,5 +1,4 @@
-package dotty.tools.dotc
-package vulpix
+package dotty.tools.vulpix
 
 import java.io.{
   File => JFile,
@@ -9,7 +8,7 @@ import java.io.{
 }
 import java.lang.reflect.InvocationTargetException
 
-import dotty.tools.dotc.vulpix.Statuses._
+import dotty.tools.vulpix.Statuses._
 
 object ChildMain {
   val realStdin = System.in
diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -1,6 +1,5 @@
 package dotty
 package tools
-package dotc
 package vulpix
 
 import java.io.{ File => JFile }
@@ -16,11 +15,12 @@ import scala.util.Try
 import scala.collection.mutable
 import scala.util.matching.Regex
 
-import core.Contexts._
-import reporting.{ Reporter, TestReporter }
-import reporting.diagnostic.MessageContainer
-import interfaces.Diagnostic.ERROR
+import dotc.core.Contexts._
+import dotc.reporting.{ Reporter, TestReporter }
+import dotc.reporting.diagnostic.MessageContainer
+import dotc.interfaces.Diagnostic.ERROR
 import dotc.util.DiffUtil
+import dotc.{ Driver, Compiler }
 
 import vulpix.Statuses._
 
diff --git a/compiler/test/dotty/tools/vulpix/RunnerOrchestration.scala b/compiler/test/dotty/tools/vulpix/RunnerOrchestration.scala
@@ -1,4 +1,4 @@
-package dotty.tools.dotc
+package dotty.tools
 package vulpix
 
 import java.io.{
diff --git a/compiler/test/dotty/tools/vulpix/Statuses.java b/compiler/test/dotty/tools/vulpix/Statuses.java
@@ -1,4 +1,4 @@
-package dotty.tools.dotc.vulpix;
+package dotty.tools.vulpix;
 
 import java.io.Serializable;
 
diff --git a/compiler/test/dotty/tools/vulpix/SummaryReport.java b/compiler/test/dotty/tools/vulpix/SummaryReport.java
@@ -1,4 +1,4 @@
-package dotty.tools.dotc.vulpix;
+package dotty.tools.vulpix;
 
 import org.junit.BeforeClass;
 import org.junit.AfterClass;
diff --git a/compiler/test/dotty/tools/vulpix/VulpixTests.scala b/compiler/test/dotty/tools/vulpix/VulpixTests.scala
@@ -1,6 +1,4 @@
-package dotty
-package tools
-package dotc
+package dotty.tools
 package vulpix
 
 import org.junit.Assert._
@@ -10,7 +8,7 @@ import scala.concurrent.duration._
 import scala.util.control.NonFatal
 
 class VulpixTests extends ParallelTesting {
-  import CompilationTests._
+  import dotc.CompilationTests._
 
   def maxDuration = 3.seconds
   def numberOfSlaves = 5

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dotty.tools.dotc`
	`1`	`+package dotty.tools`
`2`	`2`	`package vulpix`
`3`	`3`
`4`	`4`	`import java.io.{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dotty.tools.dotc.vulpix;`
	`1`	`+package dotty.tools.vulpix;`
`2`	`2`
`3`	`3`	`import java.io.Serializable;`
`4`	`4`