Skip to content

Commit 3e24960

Browse files
committed
Dotty imports are aligned with Scala 2
Remove comment referring to ancient Scala 2 bug. Adjust imports to read: imports relative to packaging, then absolute dotty packages, then scala packages.
1 parent b3f908d commit 3e24960

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

compiler/src/dotty/tools/dotc/config/Settings.scala

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
package dotty.tools.dotc
22
package config
33

4-
import collection.mutable.ArrayBuffer
5-
import scala.util.{ Success, Failure }
6-
import reflect.ClassTag
74
import core.Contexts._
8-
import scala.annotation.tailrec
9-
import dotty.tools.io.{ AbstractFile, Directory, JarArchive, PlainDirectory }
105

11-
// import annotation.unchecked
12-
// Dotty deviation: Imports take precedence over definitions in enclosing package
13-
// (Note that @unchecked is in scala, not annotation, so annotation.unchecked gives
14-
// us a package, which is not what was intended anyway).
6+
import dotty.tools.io.{AbstractFile, Directory, JarArchive, PlainDirectory}
7+
8+
import annotation.tailrec
9+
import collection.mutable.ArrayBuffer
1510
import language.existentials
11+
import reflect.ClassTag
12+
import scala.util.{Success, Failure}
1613

1714
object Settings {
1815

0 commit comments

Comments
 (0)