Cleanup

Author: allanrenucci

compiler/src/dotty/tools/dotc/core/SymDenotations.scala

@@ -340,14 +340,6 @@ object SymDenotations {
       case Nil => Nil
     }
 
-    final def children(implicit ctx: Context): List[Symbol] =
-      this.annotations.filter(_.symbol == ctx.definitions.ChildAnnot).map { annot =>
-        // refer to definition of Annotation.makeChild
-        annot.tree match {
-          case Apply(TypeApply(_, List(tpTree)), _) => tpTree.symbol
-        }
-      }
-
     /** The denotation is completed: info is not a lazy type and attributes have defined values */
     final def isCompleted: Boolean = !myInfo.isInstanceOf[LazyType]
 
@@ -934,7 +926,7 @@ object SymDenotations {
      *  except for a toplevel module, where its module class is returned.
      */
     final def topLevelClass(implicit ctx: Context): Symbol = {
-      def topLevel(d: SymDenotation): Symbol = {
+      @tailrec def topLevel(d: SymDenotation): Symbol = {
         if (d.isTopLevelClass) d.symbol
         else topLevel(d.owner)
       }

compiler/src/dotty/tools/dotc/transform/patmat/Space.scala

@@ -502,7 +502,7 @@ class SpaceEngine(implicit ctx: Context) extends SpaceLogic {
 
   /** Decompose a type into subspaces -- assume the type can be decomposed */
   def decompose(tp: Type): List[Space] = {
-    val children = tp.classSymbol.denot.children
+    val children = tp.classSymbol.children
 
     debug.println(s"candidates for ${tp.show} : [${children.map(_.show).mkString(", ")}]")
 

sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala

@@ -143,17 +143,8 @@ object DottyPlugin extends AutoPlugin {
 
   override def projectSettings: Seq[Setting[_]] = {
     Seq(
-      isDotty := {
-        val log = sLog.value
+      isDotty := scalaVersion.value.startsWith("0."),
 
-        sbtFullVersion(sbtVersion.value) match {
-          case Some((sbtMajor, sbtMinor, sbtPatch)) if sbtMajor == 0 && sbtMinor == 13 && sbtPatch < 15 =>
-            log.error(s"The sbt-dotty plugin cannot work with this version of sbt (${sbtVersion.value}), sbt >= 0.13.15 is required.")
-            false
-          case _ =>
-            scalaVersion.value.startsWith("0.")
-        }
-      },
       scalaOrganization := {
         if (isDotty.value)
           "ch.epfl.lamp"
@@ -176,13 +167,6 @@ object DottyPlugin extends AutoPlugin {
           dottyBridge
         else
           scalaBridge
-      },
-
-      scalaBinaryVersion := {
-        if (isDotty.value)
-          scalaVersion.value.split("\\.").take(2).mkString(".") // Not needed with sbt >= 0.13.16
-        else
-          scalaBinaryVersion.value
       }
     )
   }