Make sure only aliases in dotty.io are used

felixmulder · felixmulder · commit defc4551806a · 2017-05-09T14:25:48.000+02:00
Previously, we would use `scala.reflect.io._` directly. The first part
of abstracting away reflect is to kill this direct dependency.
diff --git a/compiler/sjs/backend/sjs/JSCodeGen.scala b/compiler/sjs/backend/sjs/JSCodeGen.scala
@@ -182,7 +182,7 @@ class JSCodeGen()(implicit ctx: Context) {
 
   private def getFileFor(cunit: CompilationUnit, sym: Symbol,
       suffix: String) = {
-    import scala.reflect.io._
+    import dotty.tools.io._
 
     val outputDirectory: AbstractFile = // TODO Support virtual files
       new PlainDirectory(new Directory(new java.io.File(ctx.settings.d.value)))
diff --git a/compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala b/compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala
@@ -15,7 +15,7 @@ import java.io.{File => JFile}
 import scala.collection.generic.Clearable
 import scala.collection.mutable
 import scala.reflect.ClassTag
-import scala.reflect.io.{Directory, PlainDirectory, AbstractFile}
+import dotty.tools.io.{Directory, PlainDirectory, AbstractFile}
 import scala.tools.asm.{ClassVisitor, FieldVisitor, MethodVisitor}
 import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}
 import dotty.tools.dotc.core._
diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -12,7 +12,7 @@ import scala.collection.generic.Clearable
 import scala.collection.mutable
 import scala.reflect.ClassTag
 import scala.reflect.internal.util.WeakHashSet
-import scala.reflect.io.{AbstractFile, Directory, PlainDirectory}
+import dotty.tools.io.{AbstractFile, Directory, PlainDirectory}
 import scala.tools.asm.{AnnotationVisitor, ClassVisitor, FieldVisitor, MethodVisitor}
 import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}
 import dotty.tools.dotc.core._
diff --git a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala
@@ -33,7 +33,7 @@ import dotty.tools.dotc.util.{DotClass, Positions}
 import tpd._
 import StdNames._
 
-import scala.reflect.io.{AbstractFile, Directory, PlainDirectory}
+import dotty.tools.io.{AbstractFile, Directory, PlainDirectory}
 
 class GenBCode extends Phase {
   def phaseName: String = "genBCode"
@@ -62,10 +62,10 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
 
   val sourceFile = ctx.compilationUnit.source
 
-  /** Convert a `scala.reflect.io.AbstractFile` into a
+  /** Convert a `dotty.tools.io.AbstractFile` into a
    *  `dotty.tools.dotc.interfaces.AbstractFile`.
    */
-  private[this] def convertAbstractFile(absfile: scala.reflect.io.AbstractFile): interfaces.AbstractFile =
+  private[this] def convertAbstractFile(absfile: dotty.tools.io.AbstractFile): interfaces.AbstractFile =
     new interfaces.AbstractFile {
       override def name = absfile.name
       override def path = absfile.path
diff --git a/compiler/src/dotty/tools/backend/jvm/LabelDefs.scala b/compiler/src/dotty/tools/backend/jvm/LabelDefs.scala
@@ -16,7 +16,7 @@ import scala.collection.generic.Clearable
 import scala.collection.mutable
 import scala.collection.mutable.{ListBuffer, ArrayBuffer}
 import scala.reflect.ClassTag
-import scala.reflect.io.{Directory, PlainDirectory, AbstractFile}
+import dotty.tools.io.{Directory, PlainDirectory, AbstractFile}
 import scala.tools.asm.{ClassVisitor, FieldVisitor, MethodVisitor}
 import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}
 import dotty.tools.dotc.core._
diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala
@@ -18,7 +18,7 @@ import java.io.{BufferedWriter, OutputStreamWriter}
 import printing.XprintMode
 
 import scala.annotation.tailrec
-import scala.reflect.io.VirtualFile
+import dotty.tools.io.VirtualFile
 import scala.util.control.NonFatal
 
 /** A compiler run. Exports various methods to compile source files */
diff --git a/compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala b/compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala
@@ -1,15 +1,13 @@
 /*
  * Copyright (c) 2014 Contributor. All rights reserved.
  */
-package dotty.tools.dotc.classpath
+package dotty.tools
+package dotc.classpath
 
 import java.net.URL
 import scala.annotation.tailrec
 import scala.collection.mutable.ArrayBuffer
-import scala.reflect.internal.FatalError
-import scala.reflect.io.AbstractFile
-import dotty.tools.io.ClassPath
-import dotty.tools.io.ClassRepresentation
+import dotty.tools.io.{ AbstractFile, ClassPath, ClassRepresentation }
 
 /**
  * A classpath unifying multiple class- and sourcepath entries.
diff --git a/compiler/src/dotty/tools/dotc/classpath/ClassPath.scala b/compiler/src/dotty/tools/dotc/classpath/ClassPath.scala
@@ -3,7 +3,7 @@
  */
 package dotty.tools.dotc.classpath
 
-import scala.reflect.io.AbstractFile
+import dotty.tools.io.AbstractFile
 import dotty.tools.io.ClassRepresentation
 
 case class ClassPathEntries(packages: Seq[PackageEntry], classesAndSources: Seq[ClassRepresentation])
diff --git a/compiler/src/dotty/tools/dotc/classpath/ClassPathFactory.scala b/compiler/src/dotty/tools/dotc/classpath/ClassPathFactory.scala
@@ -3,8 +3,8 @@
  */
 package dotty.tools.dotc.classpath
 
-import scala.reflect.io.{AbstractFile, VirtualDirectory}
-import scala.reflect.io.Path.string2path
+import dotty.tools.io.{AbstractFile, VirtualDirectory}
+import dotty.tools.io.Path.string2path
 import dotty.tools.dotc.config.Settings
 import FileUtils.AbstractFileOps
 import dotty.tools.io.ClassPath
diff --git a/compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala b/compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala
@@ -10,8 +10,7 @@ import java.util.function.IntFunction
 import java.util
 import java.util.Comparator
 
-import scala.reflect.io.{AbstractFile, PlainFile}
-import dotty.tools.io.{ClassPath, ClassRepresentation, PlainNioFile}
+import dotty.tools.io.{AbstractFile, PlainFile, ClassPath, ClassRepresentation, PlainNioFile}
 import FileUtils._
 import scala.collection.JavaConverters._
 
@@ -118,7 +117,7 @@ trait JFileDirectoryLookup[FileEntryType <: ClassRepresentation] extends Directo
     } else Array()
   }
   protected def getName(f: File): String = f.getName
-  protected def toAbstractFile(f: File): AbstractFile = new PlainFile(new scala.reflect.io.File(f))
+  protected def toAbstractFile(f: File): AbstractFile = new PlainFile(new dotty.tools.io.File(f))
   protected def isPackage(f: File): Boolean = f.isPackage
 
   assert(dir != null, "Directory file in DirectoryFileLookup cannot be null")
@@ -208,7 +207,7 @@ case class DirectoryClassPath(dir: File) extends JFileDirectoryLookup[ClassFileE
     val relativePath = FileUtils.dirPath(className)
     val classFile = new File(s"$dir/$relativePath.class")
     if (classFile.exists) {
-      val wrappedClassFile = new scala.reflect.io.File(classFile)
+      val wrappedClassFile = new dotty.tools.io.File(classFile)
       val abstractClassFile = new PlainFile(wrappedClassFile)
       Some(abstractClassFile)
     } else None
@@ -235,7 +234,7 @@ case class DirectorySourcePath(dir: File) extends JFileDirectoryLookup[SourceFil
       .collectFirst { case file if file.exists() => file }
 
     sourceFile.map { file =>
-      val wrappedSourceFile = new scala.reflect.io.File(file)
+      val wrappedSourceFile = new dotty.tools.io.File(file)
       val abstractSourceFile = new PlainFile(wrappedSourceFile)
       abstractSourceFile
     }
diff --git a/compiler/src/dotty/tools/dotc/classpath/FileUtils.scala b/compiler/src/dotty/tools/dotc/classpath/FileUtils.scala
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2014 Contributor. All rights reserved.
  */
-package dotty.tools.dotc.classpath
+package dotty.tools
+package dotc.classpath
 
 import java.io.{File => JFile, FileFilter}
 import java.net.URL
-import scala.reflect.internal.FatalError
-import scala.reflect.io.AbstractFile
+import dotty.tools.io.AbstractFile
 
 /**
  * Common methods related to Java files and abstract files used in the context of classpath
diff --git a/compiler/src/dotty/tools/dotc/classpath/VirtualDirectoryClassPath.scala b/compiler/src/dotty/tools/dotc/classpath/VirtualDirectoryClassPath.scala
@@ -1,7 +1,7 @@
 package dotty.tools.dotc.classpath
 
 import dotty.tools.io.ClassRepresentation
-import scala.reflect.io.{AbstractFile, Path, PlainFile, VirtualDirectory}
+import dotty.tools.io.{AbstractFile, Path, PlainFile, VirtualDirectory}
 import FileUtils._
 import java.net.URL
 
diff --git a/compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala b/compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala
@@ -6,8 +6,7 @@ package dotty.tools.dotc.classpath
 import java.io.File
 import java.net.URL
 import scala.annotation.tailrec
-import scala.reflect.io.{AbstractFile, FileZipArchive, ManifestResources}
-import dotty.tools.io.ClassPath
+import dotty.tools.io.{AbstractFile, ClassPath, FileZipArchive, ManifestResources}
 import dotty.tools.dotc.config.Settings
 import dotty.tools.dotc.core.Contexts.Context
 import FileUtils._
diff --git a/compiler/src/dotty/tools/dotc/classpath/ZipArchiveFileLookup.scala b/compiler/src/dotty/tools/dotc/classpath/ZipArchiveFileLookup.scala
@@ -6,8 +6,7 @@ package dotty.tools.dotc.classpath
 import java.io.File
 import java.net.URL
 import scala.collection.Seq
-import scala.reflect.io.AbstractFile
-import scala.reflect.io.FileZipArchive
+import dotty.tools.io.{ AbstractFile, FileZipArchive }
 import FileUtils.AbstractFileOps
 import dotty.tools.io.{ClassPath, ClassRepresentation}
 
diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -8,7 +8,7 @@ import NameOps._, NameKinds._
 import Scopes.Scope
 import collection.mutable
 import collection.BitSet
-import scala.reflect.io.AbstractFile
+import dotty.tools.io.AbstractFile
 import Decorators.SymbolIteratorDecorator
 import ast._
 import annotation.tailrec
diff --git a/compiler/src/dotty/tools/dotc/repl/CompilingInterpreter.scala b/compiler/src/dotty/tools/dotc/repl/CompilingInterpreter.scala
@@ -15,7 +15,7 @@ import scala.collection.mutable.{ListBuffer, HashSet, ArrayBuffer}
 
 //import ast.parser.SyntaxAnalyzer
 import io.{PlainFile, VirtualDirectory}
-import scala.reflect.io.{PlainDirectory, Directory}
+import dotty.tools.io.{PlainDirectory, Directory}
 import reporting.{ConsoleReporter, Reporter}
 import core.Flags
 import util.{SourceFile, NameTransformer}
diff --git a/compiler/src/dotty/tools/dotc/repl/REPL.scala b/compiler/src/dotty/tools/dotc/repl/REPL.scala
@@ -5,7 +5,7 @@ package repl
 import core.Contexts.Context
 import reporting.Reporter
 import io.{AbstractFile, PlainFile, VirtualDirectory}
-import scala.reflect.io.{PlainDirectory, Directory}
+import dotty.tools.io.{PlainDirectory, Directory}
 import java.io.{BufferedReader, File => JFile, FileReader, PrintWriter}
 import java.net.{URL, URLClassLoader}
 
diff --git a/compiler/src/dotty/tools/io/package.scala b/compiler/src/dotty/tools/io/package.scala
@@ -18,13 +18,15 @@ package object io {
   val Directory = scala.reflect.io.Directory
   type File = scala.reflect.io.File
   val File = scala.reflect.io.File
+  type ManifestResources = scala.reflect.io.ManifestResources
   type Path = scala.reflect.io.Path
   val Path = scala.reflect.io.Path
   val Streamable = scala.reflect.io.Streamable
   type VirtualDirectory = scala.reflect.io.VirtualDirectory
   type VirtualFile = scala.reflect.io.VirtualFile
-  val ZipArchive = scala.reflect.io.ZipArchive
   type ZipArchive = scala.reflect.io.ZipArchive
+  val ZipArchive = scala.reflect.io.ZipArchive
+  type FileZipArchive = scala.reflect.io.FileZipArchive
   type JManifest = java.util.jar.Manifest
   type JFile = java.io.File
 
diff --git a/compiler/src/scala/tools/nsc/io/package.scala b/compiler/src/scala/tools/nsc/io/package.scala
@@ -10,17 +10,17 @@ package scala.tools.nsc
  * See http://dotty.epfl.ch/docs/contributing/backend.html for more information.
  */
 package object io {
-  type AbstractFile = scala.reflect.io.AbstractFile
-  val AbstractFile = scala.reflect.io.AbstractFile
+  type AbstractFile = dotty.tools.io.AbstractFile
+  val AbstractFile = dotty.tools.io.AbstractFile
 
-  type Directory = scala.reflect.io.Directory
-  val Directory = scala.reflect.io.Directory
+  type Directory = dotty.tools.io.Directory
+  val Directory = dotty.tools.io.Directory
 
-  type Path = scala.reflect.io.Path
-  val Path = scala.reflect.io.Path
+  type Path = dotty.tools.io.Path
+  val Path = dotty.tools.io.Path
 
-  type File = scala.reflect.io.File
-  val File = scala.reflect.io.File
+  type File = dotty.tools.io.File
+  val File = dotty.tools.io.File
 
   type Jar = dotty.tools.io.Jar
   val Jar = dotty.tools.io.Jar
diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala
@@ -8,7 +8,7 @@ import org.junit.{Before, Test}
 import org.junit.Assert._
 
 import java.io.{ File => JFile }
-import scala.reflect.io.Directory
+import dotty.tools.io.Directory
 import scala.io.Source
 
 /** WARNING
diff --git a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala
@@ -5,7 +5,7 @@ import dotc.core.Contexts.{Context, ContextBase}
 import dotc.core.Phases.Phase
 import dotc.Compiler
 
-import scala.reflect.io.{VirtualDirectory => Directory}
+import dotty.tools.io.{VirtualDirectory => Directory}
 import scala.tools.asm
 import asm._
 import asm.tree._
diff --git a/compiler/test/dotty/tools/dotc/CompilerTest.scala b/compiler/test/dotty/tools/dotc/CompilerTest.scala
@@ -9,7 +9,7 @@ import util.SourcePosition
 import config.CompilerCommand
 import dotty.tools.io.PlainFile
 import scala.collection.mutable.ListBuffer
-import scala.reflect.io.{ Path, Directory, File => SFile, AbstractFile }
+import dotty.tools.io.{ Path, Directory, File => SFile, AbstractFile }
 import scala.annotation.tailrec
 import java.io.{ RandomAccessFile, File => JFile }
 
diff --git a/compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala b/compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala
@@ -3,7 +3,7 @@ package dotc
 package parsing
 
 import Tokens._, Parsers._
-import scala.reflect.io._
+import dotty.tools.io._
 import util._
 import core._
 import ast.Trees._
diff --git a/compiler/test/dotty/tools/dotc/parsing/ParserTest.scala b/compiler/test/dotty/tools/dotc/parsing/ParserTest.scala
@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package parsing
 
-import scala.reflect.io._
+import dotty.tools.io._
 import util._
 import core._
 import scala.io.Codec
diff --git a/compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala b/compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala
@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package parsing
 
-import scala.reflect.io._
+import dotty.tools.io._
 import scala.io.Codec
 import util._
 import Tokens._, Scanners._
diff --git a/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala b/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala
@@ -6,7 +6,7 @@ package transform
 import java.io._
 
 import scala.io.Source._
-import scala.reflect.io.Directory
+import dotty.tools.io.Directory
 import org.junit.Test
 import reporting.TestReporter
 import vulpix.TestConfiguration
