scala · smarter · Jun 28, 2019 · Jun 28, 2019
diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
@@ -237,8 +237,6 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
     api.ClassLikeDef.of(name, acc, modifiers, anns, tparams, defType)
   }
 
-  private[this] val LegacyAppClass = ctx.requiredClass("dotty.runtime.LegacyApp")
-
   def apiClassStructure(csym: ClassSymbol): api.Structure = {
     val cinfo = csym.classInfo
 
@@ -274,9 +272,7 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
     // TODO: We shouldn't have to compute inherited members. Instead, `Structure`
     // should have a lazy `parentStructures` field.
     val inherited = cinfo.baseClasses
-      // We cannot filter out `LegacyApp` because it contains the main method,
-      // see the comment about main class discovery in `computeType`.
-      .filter(bc => !bc.is(Scala2x) || bc.eq(LegacyAppClass))
+      .filter(bc => !bc.is(Scala2x))
       .flatMap(_.classInfo.decls.filter(s => !(s.is(Private) || declSet.contains(s))))
     // Inherited members need to be computed lazily because a class might contain
     // itself as an inherited member, like in `class A { class B extends A }`,

diff --git a/library/src/dotty/runtime/LegacyApp.scala b/library/src/dotty/runtime/LegacyApp.scala
diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/B.scala b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/B.scala
@@ -1,3 +1,3 @@
-object B extends dotty.runtime.LegacyApp {
+object B extends App {
    println(A.`=`)
 }
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/E.scala b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/E.scala
@@ -1,3 +1,3 @@
-object E extends dotty.runtime.LegacyApp {
+object E extends App {
 	assert(D.x == "3")
 }
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C0.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C0.scala
@@ -1,3 +1,3 @@
-object C extends dotty.runtime.LegacyApp {
+object C extends App {
   println(new B().foo(null))
 }
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C1.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C1.scala
@@ -1,3 +1,3 @@
-object C extends dotty.runtime.LegacyApp {
+object C extends App {
   println(new B().bar.x)
 }
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C2.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C2.scala
@@ -1,3 +1,3 @@
-object C extends dotty.runtime.LegacyApp {
+object C extends App {
   println(new B().bar("")("").x)
 }
diff --git a/tests/disabled/existential/run/names-defaults.scala b/tests/disabled/existential/run/names-defaults.scala
@@ -1,7 +1,7 @@
 
 import scala.language.{ higherKinds, existentials }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def get[T](x: T) = { println("get: "+ x); x }
 
   // TESTS

diff --git a/tests/disabled/existential/run/t0412.scala b/tests/disabled/existential/run/t0412.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(classOf[java.util.ArrayList[_]])
   println(classOf[java.util.ArrayList[T] forSome { type T }])
 }
diff --git a/tests/disabled/existential/run/t0528.scala b/tests/disabled/existential/run/t0528.scala
@@ -9,7 +9,7 @@ class RichStr extends Sequ[Char] {
   def toArray: Array[Char] = Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9')
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x: RichStr = new RichStr
 
   println((x: Sequ[Char]).toArray.deep) // calling through the bridge misses unboxing

diff --git a/tests/disabled/existential/run/t6443.scala b/tests/disabled/existential/run/t6443.scala
@@ -12,6 +12,6 @@ object B extends A {
   def foo(d: String)(d2: d.type): D forSome { type D <: Derived; type S <: Derived } = {d2.isEmpty; null} // Bridge method required here!
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   B.bar
 }
diff --git a/tests/disabled/long-running/t6253a.scala b/tests/disabled/long-running/t6253a.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.HashSet
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   var hashCount = 0
 

diff --git a/tests/disabled/long-running/t6253b.scala b/tests/disabled/long-running/t6253b.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.HashSet
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   var hashCount = 0
 

diff --git a/tests/disabled/long-running/t6253c.scala b/tests/disabled/long-running/t6253c.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.HashSet
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   var hashCount = 0
 

diff --git a/tests/disabled/macro/run/exprs_serialize.scala b/tests/disabled/macro/run/exprs_serialize.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(expr: Expr[_]) =
     try {
       val fout = new ByteArrayOutputStream()

diff --git a/tests/disabled/macro/run/freetypes_false_alarm1.scala b/tests/disabled/macro/run/freetypes_false_alarm1.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val ru = scala.reflect.runtime.universe
     val tpe: ru.Type = ru.typeOf[List[Int]]

diff --git a/tests/disabled/macro/run/idempotency-case-classes.scala b/tests/disabled/macro/run/idempotency-case-classes.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val casee = reify {
     case class C(x: Int, y: Int)
     println(C(2, 3))

diff --git a/tests/disabled/macro/run/idempotency-extractors.scala b/tests/disabled/macro/run/idempotency-extractors.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   object Extractor { def unapply(x: Int): Option[Int] = Some(x) }
   val extractor = reify {
     2 match { case Extractor(x) => x }

diff --git a/tests/disabled/macro/run/idempotency-labels.scala b/tests/disabled/macro/run/idempotency-labels.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val label = reify {
     var x = 0
     while (x < 2) { x += 1 }

diff --git a/tests/disabled/macro/run/idempotency-lazy-vals.scala b/tests/disabled/macro/run/idempotency-lazy-vals.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val lazee = reify {
     class C {
       lazy val x = 2

diff --git a/tests/disabled/macro/run/idempotency-this.scala b/tests/disabled/macro/run/idempotency-this.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val thiss = reify {
     List[String]("")
   }

diff --git a/tests/disabled/macro/run/macro-abort-fresh/Test_2.scala b/tests/disabled/macro/run/macro-abort-fresh/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox

diff --git a/tests/disabled/macro/run/macro-auto-duplicate/Test_2.scala b/tests/disabled/macro/run/macro-auto-duplicate/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo)
 }
diff --git a/tests/disabled/macro/run/macro-basic-ma-md-mi/Test_3.scala b/tests/disabled/macro/run/macro-basic-ma-md-mi/Test_3.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros.Shmacros._
   println(foo(2) + Macros.bar(2) * new Macros().quux(4))
 }
diff --git a/tests/disabled/macro/run/macro-basic-ma-mdmi/Test_2.scala b/tests/disabled/macro/run/macro-basic-ma-mdmi/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros.Shmacros._
   println(foo(2) + Macros.bar(2) * new Macros().quux(4))
 }
diff --git a/tests/disabled/macro/run/macro-basic-mamd-mi/Macros_Test_2.scala b/tests/disabled/macro/run/macro-basic-mamd-mi/Macros_Test_2.scala
@@ -9,7 +9,7 @@ class Macros {
   def quux(x: Int): Int = macro Impls.quux
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros.Shmacros._
   println(foo(2) + Macros.bar(2) * new Macros().quux(4))
 }
diff --git a/tests/disabled/macro/run/macro-blackbox-materialization/Test_2.scala b/tests/disabled/macro/run/macro-blackbox-materialization/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[C[Int]])
   println(implicitly[C[String]])
   println(implicitly[C[Nothing]])

diff --git a/tests/disabled/macro/run/macro-bodyexpandstoimpl/Macros_Test_2.scala b/tests/disabled/macro/run/macro-bodyexpandstoimpl/Macros_Test_2.scala
@@ -4,7 +4,7 @@ object Macros {
   def foo(x: Int): Int = macro Impls.refToFoo(42)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   println(foo(42))
 }
diff --git a/tests/disabled/macro/run/macro-bundle-context-alias/Test_2.scala b/tests/disabled/macro/run/macro-bundle-context-alias/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(new C().blackbox)
   println(new C().refinedBlackbox)
   println(new C().whitebox)

diff --git a/tests/disabled/macro/run/macro-bundle-context-refinement/Test_2.scala b/tests/disabled/macro/run/macro-bundle-context-refinement/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(new C().blackbox)
   println(new C().whitebox)
 }
diff --git a/tests/disabled/macro/run/macro-bundle-static/Test_2.scala b/tests/disabled/macro/run/macro-bundle-static/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.mono)
   println(Macros.poly[Int])
   println(new Enclosing.Impl(???).weird)

diff --git a/tests/disabled/macro/run/macro-bundle-toplevel/Test_2.scala b/tests/disabled/macro/run/macro-bundle-toplevel/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.mono)
   println(Macros.poly[Int])
   println(new Impl(???).weird)

diff --git a/tests/disabled/macro/run/macro-bundle-whitebox-decl/Test_2.scala b/tests/disabled/macro/run/macro-bundle-whitebox-decl/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.mono)
   println(Macros.poly[Int])
   println(new Impl(???).weird)

diff --git a/tests/disabled/macro/run/macro-bundle-whitebox-use-raw/Test_2.scala b/tests/disabled/macro/run/macro-bundle-whitebox-use-raw/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(ReturnTypeRefinement.foo.x)
 
   case class Foo(i: Int, s: String, b: Boolean)

diff --git a/tests/disabled/macro/run/macro-bundle-whitebox-use-refined/Test_2.scala b/tests/disabled/macro/run/macro-bundle-whitebox-use-refined/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(ReturnTypeRefinement.foo.x)
 
   case class Foo(i: Int, s: String, b: Boolean)

diff --git a/tests/disabled/macro/run/macro-def-path-dependent/Dummy.scala b/tests/disabled/macro/run/macro-def-path-dependent/Dummy.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println("it works")
 }
diff --git a/tests/disabled/macro/run/macro-default-params/Test_2.scala b/tests/disabled/macro/run/macro-default-params/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
diff --git a/tests/disabled/macro/run/macro-divergence-spurious/Test_2.scala b/tests/disabled/macro/run/macro-divergence-spurious/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[Complex[Foo]])
 }
diff --git a/tests/disabled/macro/run/macro-duplicate/Test_2.scala b/tests/disabled/macro/run/macro-duplicate/Test_2.scala
@@ -1,6 +1,6 @@
 import scala.concurrent._
 import ExecutionContext.Implicits.global
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
diff --git a/tests/disabled/macro/run/macro-enclosingowner-detectvar/Test_2.scala b/tests/disabled/macro/run/macro-enclosingowner-detectvar/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val a1 = Macros.foo
   val a2 = Predef.identity(Predef.identity(Macros.foo))
   val a3: Int = Macros.foo

diff --git a/tests/disabled/macro/run/macro-enclosingowner-sbt/Test_2.scala b/tests/disabled/macro/run/macro-enclosingowner-sbt/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val a1 = Macros.foo
   val a2 = Predef.identity(Predef.identity(Macros.foo))
   val a3: Int = Macros.foo

diff --git a/tests/disabled/macro/run/macro-enclosures/Test_2.scala b/tests/disabled/macro/run/macro-enclosures/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   test.Test.test
 }
 

diff --git a/tests/disabled/macro/run/macro-expand-implicit-argument/Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-argument/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   println(array(1, 2, 3).toList)
 }
diff --git a/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicit val x = 42
   def foo(implicit x: Int): Unit = macro Impls.foo
   foo

diff --git a/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala
@@ -3,7 +3,7 @@ object Macros {
   implicit def foo(x: String): Option[Int] = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   println("2": Option[Int])
   val s: Int = "2" getOrElse 0

diff --git a/tests/disabled/macro/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicit def foo: Int = macro Impls.foo
   def bar(implicit x: Int) = println(x)
   bar

diff --git a/tests/disabled/macro/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala
@@ -5,7 +5,7 @@ object Macros {
   implicit def foo(x: String): Option[Int] = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   def bar[T <% Option[Int]](x: T) = println(x)
   println("2")

diff --git a/tests/disabled/macro/run/macro-expand-multiple-arglists/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-multiple-arglists/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(x: Int)(y: Int): Unit = macro Impls.foo
   foo(40)(2)
 }
diff --git a/tests/disabled/macro/run/macro-expand-nullary-generic/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-nullary-generic/Macros_Test_2.scala
@@ -5,7 +5,7 @@ object Macros {
   def bar2[T](x: Int)(): Unit = macro Impls.barEmpty[T]
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo1[Int]
   Macros.foo2[Int]
   Macros.foo2[Int]()

diff --git a/tests/disabled/macro/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala
@@ -5,7 +5,7 @@ object Macros {
   def bar2(x: Int)(): Unit = macro Impls.barEmpty
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo1
   Macros.foo2
   Macros.foo2()

diff --git a/tests/disabled/macro/run/macro-expand-overload/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-overload/Macros_Test_2.scala
@@ -10,7 +10,7 @@ class Macros {
   def foo(x: Boolean): Unit = println("fooClassBoolean")
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo("42")
   Macros.foo(42)
   Macros.foo(true)

diff --git a/tests/disabled/macro/run/macro-expand-override/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-override/Macros_Test_2.scala
@@ -14,7 +14,7 @@ class Z extends D {
   override def foo(x: Boolean): Unit = println("fooZBoolean")
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val dd: D = new D()
   dd.foo("42")