From 3678b968e3edd4388e62435161d9ce7356f7cb2c Mon Sep 17 00:00:00 2001 From: odersky Date: Mon, 21 Feb 2011 18:32:06 +0000 Subject: [PATCH] Renamed Application to App. git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24321 5e8d7ff9-d8ef-0310-90f0-a4852d11357a --- test/files/buildmanager/namesdefaults/defparam-use.scala | 2 +- test/files/detach-neg/det_bar.scala | 2 +- test/files/jvm/console.scala | 2 +- test/files/jvm/genericNest.scala | 2 +- test/files/jvm/manifests.scala | 2 +- test/files/jvm/methvsfield.scala | 2 +- test/files/jvm/nest.scala | 2 +- test/files/jvm/outerEnum.scala | 2 +- test/files/jvm/typerep.scala | 2 +- test/files/jvm/xml01.scala | 2 +- test/files/jvm/xmlmore.scala | 2 +- test/files/neg/bug1241.scala | 2 +- test/files/neg/bug1623.scala | 2 +- test/files/neg/bug1878.scala | 2 +- test/files/neg/bug1960.scala | 2 +- test/files/neg/bug4217.scala | 2 +- test/files/neg/bug515.scala | 2 +- test/files/neg/bug556.scala | 2 +- test/files/neg/bug783.scala | 2 +- test/files/neg/bug835.scala | 2 +- test/files/neg/bug845.scala | 2 +- test/files/neg/bug875.scala | 2 +- test/files/neg/bug876.scala | 2 +- test/files/neg/bug910.scala | 2 +- test/files/neg/bug997.scala | 2 +- test/files/neg/names-defaults-neg-ref.scala | 2 +- test/files/neg/names-defaults-neg-warn.scala | 2 +- test/files/neg/names-defaults-neg.scala | 2 +- test/files/neg/null-unsoundness.scala | 2 +- test/files/neg/override.scala | 2 +- test/files/neg/pat_unreachable.scala | 2 +- test/files/neg/sabin2.scala | 2 +- test/files/neg/spec-overrides.scala | 2 +- test/files/neg/structural.scala | 2 +- test/files/neg/t0117.scala | 2 +- test/files/neg/t0152.scala | 2 +- test/files/neg/t0259.scala | 2 +- test/files/neg/t0528neg.scala | 2 +- test/files/neg/t0565.scala | 2 +- test/files/neg/t1009.scala | 2 +- test/files/neg/t1477.scala | 2 +- test/files/neg/t2031.scala | 2 +- test/files/neg/t2078.scala | 2 +- test/files/neg/t2139.scala | 2 +- test/files/neg/t3006.scala | 2 +- test/files/neg/t3015.scala | 2 +- test/files/neg/t3224.scala | 2 +- test/files/neg/unreachablechar.scala | 2 +- test/files/neg/volatile-intersection.scala | 2 +- test/files/neg/volatile.scala | 2 +- test/files/pos/bug0305.scala | 2 +- test/files/pos/bug1000.scala | 2 +- test/files/pos/bug1006.scala | 2 +- test/files/pos/bug1014.scala | 2 +- test/files/pos/bug1075.scala | 2 +- test/files/pos/bug115.scala | 2 +- test/files/pos/bug1168.scala | 2 +- test/files/pos/bug1560.scala | 2 +- test/files/pos/bug210.scala | 2 +- test/files/pos/bug211.scala | 2 +- test/files/pos/bug2168.scala | 2 +- test/files/pos/bug2187.scala | 2 +- test/files/pos/bug2261.scala | 2 +- test/files/pos/bug261-ab.scala | 4 ++-- test/files/pos/bug261-ba.scala | 4 ++-- test/files/pos/bug267.scala | 2 +- test/files/pos/bug342.scala | 2 +- test/files/pos/bug348plus.scala | 2 +- test/files/pos/bug374.scala | 2 +- test/files/pos/bug430.scala | 2 +- test/files/pos/bug514.scala | 2 +- test/files/pos/bug531.scala | 2 +- test/files/pos/bug532.scala | 2 +- test/files/pos/bug613.scala | 4 ++-- test/files/pos/bug675.scala | 2 +- test/files/pos/bug698.scala | 2 +- test/files/pos/bug711.scala | 2 +- test/files/pos/bug720.scala | 2 +- test/files/pos/bug757.scala | 2 +- test/files/pos/bug759.scala | 2 +- test/files/pos/bug796.scala | 2 +- test/files/pos/bug812.scala | 4 ++-- test/files/pos/channels.scala | 4 ++-- test/files/pos/comp-rec-test.scala | 2 +- test/files/pos/constfold.scala | 2 +- test/files/pos/gosh.scala | 2 +- test/files/pos/gui.scala | 6 +++--- test/files/pos/init.scala | 2 +- test/files/pos/lexical.scala | 2 +- test/files/pos/pos-bug1241.scala | 2 +- test/files/pos/scoping1.scala | 2 +- test/files/pos/spec-Function1.scala | 2 +- test/files/pos/spec-lists.scala | 2 +- test/files/pos/spec-sealed.scala | 2 +- test/files/pos/sudoku.scala | 2 +- test/files/pos/t0231.scala | 2 +- test/files/pos/t0651.scala | 2 +- test/files/pos/t0674.scala | 2 +- test/files/pos/t1027.scala | 2 +- test/files/pos/t1545.scala | 2 +- test/files/pos/t1560.scala | 2 +- test/files/pos/t1756.scala | 2 +- test/files/pos/t2234.scala | 2 +- test/files/pos/t2425.scala | 2 +- test/files/pos/tcpoly_infer_ticket1864.scala | 2 +- test/files/pos/tcpoly_infer_ticket716.scala | 4 ++-- test/files/pos/typerep-stephane.scala | 2 +- test/files/pos/typerep_pos.scala | 2 +- test/files/pos/unapplyVal.scala | 2 +- test/files/run/OrderingTest.scala | 2 +- test/files/run/ReverseSeqView.scala | 2 +- test/files/run/amp.scala | 2 +- test/files/run/arrayclone.scala | 2 +- test/files/run/arybufgrow.scala | 2 +- test/files/run/bitsets.scala | 2 +- test/files/run/breakout.scala | 4 ++-- test/files/run/bug1042.scala | 2 +- test/files/run/bug1044.scala | 2 +- test/files/run/bug1079.scala | 2 +- test/files/run/bug1110.scala | 2 +- test/files/run/bug1141.scala | 2 +- test/files/run/bug1192.scala | 2 +- test/files/run/bug1220.scala | 2 +- test/files/run/bug1300.scala | 2 +- test/files/run/bug1373.scala | 4 ++-- test/files/run/bug1466.scala | 2 +- test/files/run/bug1766.scala | 2 +- test/files/run/bug2075.scala | 4 ++-- test/files/run/bug216.scala | 2 +- test/files/run/bug2241.scala | 2 +- test/files/run/bug2276.scala | 2 +- test/files/run/bug2552.scala | 2 +- test/files/run/bug298.scala | 4 ++-- test/files/run/bug405.scala | 2 +- test/files/run/bug657.scala | 2 +- test/files/run/bug889.scala | 2 +- test/files/run/bug949.scala | 2 +- test/files/run/bug978.scala | 2 +- test/files/run/byname.scala | 2 +- test/files/run/caseclasses.scala | 2 +- test/files/run/castsingleton.scala | 2 +- test/files/run/checked.scala | 2 +- test/files/run/collections.scala | 2 +- test/files/run/colltest.scala | 2 +- test/files/run/colltest1.scala | 2 +- test/files/run/complicatedmatch.scala | 2 +- test/files/run/contrib674.scala | 2 +- test/files/run/ctor-order.scala | 2 +- test/files/run/exc.scala | 2 +- test/files/run/exc1.scala | 2 +- test/files/run/exc2.scala | 2 +- test/files/run/exceptions-nest.scala | 2 +- test/files/run/existentials.scala | 2 +- test/files/run/exoticnames.scala | 2 +- test/files/run/finally.scala | 2 +- test/files/run/fors.scala | 2 +- test/files/run/gadts.scala | 2 +- test/files/run/implicits.scala | 2 +- test/files/run/infiniteloop.scala | 2 +- test/files/run/infix.scala | 2 +- test/files/run/inliner-infer.scala | 2 +- test/files/run/intmap.scala | 2 +- test/files/run/issue192.scala | 2 +- test/files/run/iterables.scala | 2 +- test/files/run/json.scala | 2 +- test/files/run/lazy-exprs.scala | 2 +- test/files/run/lazy-leaks.scala | 2 +- test/files/run/lazy-locals.scala | 2 +- test/files/run/lazy-override-run.scala | 2 +- test/files/run/lazy-traits.scala | 2 +- test/files/run/map_test.scala | 2 +- test/files/run/matcharraytail.scala | 2 +- test/files/run/matchbytes.scala | 2 +- test/files/run/matchemptyarray.scala | 2 +- test/files/run/matchintasany.scala | 2 +- test/files/run/matchonstream.scala | 2 +- test/files/run/missingparams.scala | 2 +- test/files/run/multi-array.scala | 2 +- test/files/run/names-defaults.scala | 2 +- test/files/run/packrat1.scala | 2 +- test/files/run/packrat2.scala | 2 +- test/files/run/preinits.scala | 2 +- test/files/run/proxy.scala | 2 +- test/files/run/randomAccessSeq-apply.scala | 2 +- test/files/run/runtime-richChar.scala | 2 +- test/files/run/slices.scala | 2 +- test/files/run/sort.scala | 2 +- test/files/run/stream_flatmap_odds.scala | 4 ++-- test/files/run/streams.scala | 2 +- test/files/run/stringbuilder.scala | 2 +- test/files/run/structural.scala | 2 +- test/files/run/t0017.scala | 2 +- test/files/run/t0042.scala | 2 +- test/files/run/t0412.scala | 2 +- test/files/run/t0421.scala | 2 +- test/files/run/t0486.scala | 2 +- test/files/run/t0508.scala | 2 +- test/files/run/t0528.scala | 2 +- test/files/run/t0607.scala | 2 +- test/files/run/t0631.scala | 2 +- test/files/run/t0663.scala | 2 +- test/files/run/t0668.scala | 2 +- test/files/run/t0677.scala | 2 +- test/files/run/t0807.scala | 2 +- test/files/run/t0883.scala | 2 +- test/files/run/t0911.scala | 2 +- test/files/run/t0936.scala | 2 +- test/files/run/t1167.scala | 2 +- test/files/run/t1323.scala | 2 +- test/files/run/t1368.scala | 2 +- test/files/run/t1423.scala | 2 +- test/files/run/t1505.scala | 2 +- test/files/run/t1524.scala | 2 +- test/files/run/t153.scala | 4 ++-- test/files/run/t1535.scala | 2 +- test/files/run/t1537.scala | 2 +- test/files/run/t1591.scala | 2 +- test/files/run/t1618.scala | 2 +- test/files/run/t1620.scala | 2 +- test/files/run/t1718.scala | 2 +- test/files/run/t1747.scala | 2 +- test/files/run/t1773.scala | 2 +- test/files/run/t1939.scala | 2 +- test/files/run/t2030.scala | 2 +- test/files/run/t2111.scala | 2 +- test/files/run/t2147.scala | 2 +- test/files/run/t2176.scala | 2 +- test/files/run/t2177.scala | 2 +- test/files/run/t2236.scala | 2 +- test/files/run/t2255.scala | 2 +- test/files/run/t2503.scala | 2 +- test/files/run/t2788.scala | 4 ++-- test/files/run/t2813.2.scala | 2 +- test/files/run/t2857.scala | 2 +- test/files/run/t3038.scala | 2 +- test/files/run/t3038b.scala | 2 +- test/files/run/t3186.scala | 2 +- test/files/run/t3361.scala | 2 +- test/files/run/t3619.scala | 4 ++-- test/files/run/t3670.scala | 6 +++--- test/files/run/t3687.scala | 2 +- test/files/run/t3719.scala | 2 +- test/files/run/t3726.scala | 2 +- test/files/run/t3763.scala | 2 +- test/files/run/t3835.scala | 2 +- test/files/run/t3857.scala | 4 ++-- test/files/run/t3950.scala | 2 +- test/files/run/t4024.scala | 2 +- test/files/run/t4146.scala | 4 ++-- test/files/run/t498.scala | 4 ++-- test/files/run/tailcalls.scala | 2 +- test/files/run/tcpoly_monads.scala | 2 +- test/files/run/tcpoly_overriding.scala | 2 +- test/files/run/tcpoly_parseridioms.scala | 2 +- test/files/run/try.scala | 2 +- test/files/run/tuples.scala | 2 +- test/files/run/typealias_overriding.scala | 2 +- test/files/run/unboxingBug.scala | 2 +- test/files/run/viewtest.scala | 2 +- test/files/run/weakconform.scala | 2 +- test/files/shootout/hello.scala | 2 +- test/files/specialized/spec-early.scala | 2 +- test/files/specialized/spec-overrides.scala | 2 +- 263 files changed, 284 insertions(+), 284 deletions(-) diff --git a/test/files/buildmanager/namesdefaults/defparam-use.scala b/test/files/buildmanager/namesdefaults/defparam-use.scala index a8a2a9f44..5b5bbb3f4 100644 --- a/test/files/buildmanager/namesdefaults/defparam-use.scala +++ b/test/files/buildmanager/namesdefaults/defparam-use.scala @@ -1,5 +1,5 @@ -object Test extends Application { +object Test extends App { val outer = new Outer new outer.Inner } diff --git a/test/files/detach-neg/det_bar.scala b/test/files/detach-neg/det_bar.scala index 1f4dd9e89..862afb1d6 100644 --- a/test/files/detach-neg/det_bar.scala +++ b/test/files/detach-neg/det_bar.scala @@ -7,7 +7,7 @@ class A(y: Int) { detach(bar) } -object test extends Application { +object test extends App { val a = new A(1) println(a.bar(2)) } diff --git a/test/files/jvm/console.scala b/test/files/jvm/console.scala index 6d1aa1eaf..75449416a 100644 --- a/test/files/jvm/console.scala +++ b/test/files/jvm/console.scala @@ -1,6 +1,6 @@ /** Test scala.Console functionality. */ -object Test extends Application { +object Test extends App { import Console._ print(true) diff --git a/test/files/jvm/genericNest.scala b/test/files/jvm/genericNest.scala index c1b021011..f82f198ff 100644 --- a/test/files/jvm/genericNest.scala +++ b/test/files/jvm/genericNest.scala @@ -8,6 +8,6 @@ object ForceParse extends OuterTParams[AnyRef] { var field: InnerClass = null } -object Test extends Application { +object Test extends App { ForceParse } diff --git a/test/files/jvm/manifests.scala b/test/files/jvm/manifests.scala index 3630b7977..8b6c00f9a 100644 --- a/test/files/jvm/manifests.scala +++ b/test/files/jvm/manifests.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { Test1 Test2 //Test3 // Java 1.5+ only diff --git a/test/files/jvm/methvsfield.scala b/test/files/jvm/methvsfield.scala index e9795ec6a..9b7c56591 100644 --- a/test/files/jvm/methvsfield.scala +++ b/test/files/jvm/methvsfield.scala @@ -1,4 +1,4 @@ // bug #1062 -object Test extends Application { +object Test extends App { println((new MethVsField).three) } diff --git a/test/files/jvm/nest.scala b/test/files/jvm/nest.scala index 3ab62484f..45745f570 100644 --- a/test/files/jvm/nest.scala +++ b/test/files/jvm/nest.scala @@ -5,7 +5,7 @@ /** found in nest.jar, compiled from nest.java */ import nestpkg._; -object Test extends Application { +object Test extends App { val x = nest.best.rest.test Console.println(x.inc(1)) diff --git a/test/files/jvm/outerEnum.scala b/test/files/jvm/outerEnum.scala index 18794b7db..278cef314 100644 --- a/test/files/jvm/outerEnum.scala +++ b/test/files/jvm/outerEnum.scala @@ -1,6 +1,6 @@ import enums._ -object Test extends Application { +object Test extends App { def foo { val res: OuterEnum.Foo = OuterEnum.Foo.Bar println(res) diff --git a/test/files/jvm/typerep.scala b/test/files/jvm/typerep.scala index cb00da4c2..49a216c05 100644 --- a/test/files/jvm/typerep.scala +++ b/test/files/jvm/typerep.scala @@ -4,7 +4,7 @@ import TypeRep._ -object Test extends Application { +object Test extends App { testPrimitives testOptions testLists diff --git a/test/files/jvm/xml01.scala b/test/files/jvm/xml01.scala index 574d20720..5234518b5 100644 --- a/test/files/jvm/xml01.scala +++ b/test/files/jvm/xml01.scala @@ -6,7 +6,7 @@ import scala.util.logging._ import scala.xml._ -object Test extends Application with Assert { +object Test extends App with Assert { val e: scala.xml.MetaData = Null //Node.NoAttributes val sc: scala.xml.NamespaceBinding = TopScope diff --git a/test/files/jvm/xmlmore.scala b/test/files/jvm/xmlmore.scala index 9f37ad61e..04d0a6c75 100644 --- a/test/files/jvm/xmlmore.scala +++ b/test/files/jvm/xmlmore.scala @@ -1,6 +1,6 @@ object myBreak extends scala.xml.Unparsed("
") -object Test extends Application { +object Test extends App { val com = val pi = val crz = } -object Test2 extends Application { +object Test2 extends App { val b = new BImpl } diff --git a/test/files/neg/bug1878.scala b/test/files/neg/bug1878.scala index 32d5ce5e0..5278fbb7b 100644 --- a/test/files/neg/bug1878.scala +++ b/test/files/neg/bug1878.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { // illegal val err1 = "" match { case Seq(f @ _*, ',') => f } diff --git a/test/files/neg/bug1960.scala b/test/files/neg/bug1960.scala index b381e9df2..af7f27035 100644 --- a/test/files/neg/bug1960.scala +++ b/test/files/neg/bug1960.scala @@ -1,4 +1,4 @@ -object ClassFormatErrorExample extends Application { new Aclass(1) } +object ClassFormatErrorExample extends App { new Aclass(1) } trait TBase { var p:Int = 0; def f(p1: Int) {} } diff --git a/test/files/neg/bug4217.scala b/test/files/neg/bug4217.scala index 0e8a6bd07..9343a9be5 100644 --- a/test/files/neg/bug4217.scala +++ b/test/files/neg/bug4217.scala @@ -1,3 +1,3 @@ -object A extends Application { +object A extends App { 42 match { } } diff --git a/test/files/neg/bug515.scala b/test/files/neg/bug515.scala index 34f965231..bb2376dca 100644 --- a/test/files/neg/bug515.scala +++ b/test/files/neg/bug515.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { class Truc { def getMachin() = "machin" def getMachinAsTruc() = this diff --git a/test/files/neg/bug556.scala b/test/files/neg/bug556.scala index 4f4e905fb..b0113258c 100644 --- a/test/files/neg/bug556.scala +++ b/test/files/neg/bug556.scala @@ -1,4 +1,4 @@ -object Main extends Application { +object Main extends App { def f(a:Int=>Int):Int = a(4) def g:Int = f((x,y)=>x) } diff --git a/test/files/neg/bug783.scala b/test/files/neg/bug783.scala index 092008950..5d20bc6d2 100644 --- a/test/files/neg/bug783.scala +++ b/test/files/neg/bug783.scala @@ -1,6 +1,6 @@ package test; -object Main extends Application { +object Main extends App { class Global { case class Template(x : Int, y : Int) { Console.println("outer: " + Global.this); diff --git a/test/files/neg/bug835.scala b/test/files/neg/bug835.scala index 1eb724406..553d2c1be 100644 --- a/test/files/neg/bug835.scala +++ b/test/files/neg/bug835.scala @@ -1,3 +1,3 @@ -object Test extends Application { +object Test extends App { Console.println(List(List(1, 2, 3) : _*, List(4, 5, 6) : _*)) } diff --git a/test/files/neg/bug845.scala b/test/files/neg/bug845.scala index 26c2df52d..ddf6a16f3 100644 --- a/test/files/neg/bug845.scala +++ b/test/files/neg/bug845.scala @@ -1,6 +1,6 @@ package test; -object Test extends Application { +object Test extends App { type Bar; trait FooImpl; diff --git a/test/files/neg/bug875.scala b/test/files/neg/bug875.scala index 38affd5a4..841b2aec3 100644 --- a/test/files/neg/bug875.scala +++ b/test/files/neg/bug875.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { val xs = List(4, 5, 6) val ys = List(1, 2, 3, xs: _*) def mkList1(x: Int) = List(x) diff --git a/test/files/neg/bug876.scala b/test/files/neg/bug876.scala index f5e1f9c66..fb1461a7d 100644 --- a/test/files/neg/bug876.scala +++ b/test/files/neg/bug876.scala @@ -1,6 +1,6 @@ import scala.collection.mutable.HashMap -object AssertionError extends AnyRef with Application +object AssertionError extends AnyRef with App { abstract class A {} diff --git a/test/files/neg/bug910.scala b/test/files/neg/bug910.scala index 540ee7001..cc47104d1 100644 --- a/test/files/neg/bug910.scala +++ b/test/files/neg/bug910.scala @@ -1,4 +1,4 @@ -object RegExpTest1 extends Application { +object RegExpTest1 extends App { def co(x: Seq[Char]) = x match { case Seq('s','c','a','l','a', rest @ _*) => val y: Seq[Int] = rest diff --git a/test/files/neg/bug997.scala b/test/files/neg/bug997.scala index b6897e62d..42b46174d 100644 --- a/test/files/neg/bug997.scala +++ b/test/files/neg/bug997.scala @@ -1,7 +1,7 @@ // An extractor with 2 results object Foo { def unapply(x : String) = Some(Pair(x, x)) } -object Test extends Application { +object Test extends App { // Prints 'x'; ought not to compile (or maybe a should be the Pair?). "x" match { case Foo(a) => Console.println(a) } diff --git a/test/files/neg/names-defaults-neg-ref.scala b/test/files/neg/names-defaults-neg-ref.scala index 4611aadd2..17a482799 100644 --- a/test/files/neg/names-defaults-neg-ref.scala +++ b/test/files/neg/names-defaults-neg-ref.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { // #2235 new A2235 with B2235 } diff --git a/test/files/neg/names-defaults-neg-warn.scala b/test/files/neg/names-defaults-neg-warn.scala index 7cb956cc8..c7a2b2f42 100644 --- a/test/files/neg/names-defaults-neg-warn.scala +++ b/test/files/neg/names-defaults-neg-warn.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { object deprNam2 { def f(@deprecatedName('s) x: String) = 1 def f(s: Object) = 2 diff --git a/test/files/neg/names-defaults-neg.scala b/test/files/neg/names-defaults-neg.scala index 9fbe554f0..042f73708 100644 --- a/test/files/neg/names-defaults-neg.scala +++ b/test/files/neg/names-defaults-neg.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { // TESTS // re-ordering diff --git a/test/files/neg/null-unsoundness.scala b/test/files/neg/null-unsoundness.scala index f4ba859bc..3f7e42fe1 100644 --- a/test/files/neg/null-unsoundness.scala +++ b/test/files/neg/null-unsoundness.scala @@ -7,7 +7,7 @@ class A { val x: A with D = null var y: x.T = new C("abc") } -object Test extends A with Application { +object Test extends A with App { class C { type T = Int; val x = 1 } type A = C y = 42 diff --git a/test/files/neg/override.scala b/test/files/neg/override.scala index 764b06603..3e589b52e 100755 --- a/test/files/neg/override.scala +++ b/test/files/neg/override.scala @@ -10,6 +10,6 @@ trait Y extends X { n = "foo" } -object Test extends Application { +object Test extends App { new Y {} } diff --git a/test/files/neg/pat_unreachable.scala b/test/files/neg/pat_unreachable.scala index 527731e58..fc0fd4192 100644 --- a/test/files/neg/pat_unreachable.scala +++ b/test/files/neg/pat_unreachable.scala @@ -1,5 +1,5 @@ -object Test extends Application { +object Test extends App { def unreachable1(xs:Seq[Char]) = xs match { case Seq(x, y, _*) => x::y::Nil case Seq(x, y, z, w) => List(z,w) // redundant! diff --git a/test/files/neg/sabin2.scala b/test/files/neg/sabin2.scala index 308632e99..24a4e511a 100644 --- a/test/files/neg/sabin2.scala +++ b/test/files/neg/sabin2.scala @@ -1,4 +1,4 @@ -object Test extends Application +object Test extends App { abstract class Base { type T diff --git a/test/files/neg/spec-overrides.scala b/test/files/neg/spec-overrides.scala index 27d39ad4a..f77dadea5 100644 --- a/test/files/neg/spec-overrides.scala +++ b/test/files/neg/spec-overrides.scala @@ -12,7 +12,7 @@ class FX2 extends P { override def a[T](t: T): List[T] = Nil } -object Test extends Application { +object Test extends App { val fx = new FX val p = new P diff --git a/test/files/neg/structural.scala b/test/files/neg/structural.scala index de7b6efed..bfca37b22 100644 --- a/test/files/neg/structural.scala +++ b/test/files/neg/structural.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { def f(x: { type D; def m: D }): Null = null diff --git a/test/files/neg/t0117.scala b/test/files/neg/t0117.scala index 81167205a..c73227d26 100644 --- a/test/files/neg/t0117.scala +++ b/test/files/neg/t0117.scala @@ -1,6 +1,6 @@ class A { def a = 0 } trait B extends A { println(super[A].a) } -object Test extends Application { +object Test extends App { new B {} } diff --git a/test/files/neg/t0152.scala b/test/files/neg/t0152.scala index 8b2cae685..dc77ac31a 100644 --- a/test/files/neg/t0152.scala +++ b/test/files/neg/t0152.scala @@ -6,7 +6,7 @@ trait PlusOne extends Value[Int] { override def value = super.value + 1 } -object Test extends Application { +object Test extends App { object boom extends Value[java.lang.String]("foo") with PlusOne println(boom.value) // class cast exception! diff --git a/test/files/neg/t0259.scala b/test/files/neg/t0259.scala index 0975dec58..29aef7011 100644 --- a/test/files/neg/t0259.scala +++ b/test/files/neg/t0259.scala @@ -3,4 +3,4 @@ class TestCase3() { def this( groups: (String, Int)*) = this() def this( groups: String*) = this() } -object Main extends TestCase3 with Application +object Main extends TestCase3 with App diff --git a/test/files/neg/t0528neg.scala b/test/files/neg/t0528neg.scala index 30d20c95b..d19bdac73 100644 --- a/test/files/neg/t0528neg.scala +++ b/test/files/neg/t0528neg.scala @@ -7,7 +7,7 @@ class RichStr extends Sequ[Char] { def toArray: Array[Char] = new Array[Char](10) } -object Foo extends Application { +object Foo extends App { val x: RichStr = new RichStr println(x.toArray) // call directly diff --git a/test/files/neg/t0565.scala b/test/files/neg/t0565.scala index eb6e32e64..53059a4e0 100644 --- a/test/files/neg/t0565.scala +++ b/test/files/neg/t0565.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { class MacGuffin diff --git a/test/files/neg/t1009.scala b/test/files/neg/t1009.scala index b3a12dc0f..a260397d2 100644 --- a/test/files/neg/t1009.scala +++ b/test/files/neg/t1009.scala @@ -1,3 +1,3 @@ -object Foo extends Application{ +object Foo extends App{ def `` = "fish" } diff --git a/test/files/neg/t1477.scala b/test/files/neg/t1477.scala index 3ecd275a5..ab13f14b0 100644 --- a/test/files/neg/t1477.scala +++ b/test/files/neg/t1477.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { trait A trait B extends A diff --git a/test/files/neg/t2031.scala b/test/files/neg/t2031.scala index e4708c45a..fde7a603f 100644 --- a/test/files/neg/t2031.scala +++ b/test/files/neg/t2031.scala @@ -1,6 +1,6 @@ import scala.collection.immutable._ -object Test extends Application { +object Test extends App { val res0 = TreeSet(1, 2, 3) //res0.map(x => x)(TreeSet.newBuilder[Int]) diff --git a/test/files/neg/t2078.scala b/test/files/neg/t2078.scala index a697afc64..03eaa7ed0 100644 --- a/test/files/neg/t2078.scala +++ b/test/files/neg/t2078.scala @@ -2,7 +2,7 @@ class A[-S](y : S) { val f = new { val x = y } } -object Test extends Application { +object Test extends App { val a = new A(1) val b = a : A[Nothing] b.f.x diff --git a/test/files/neg/t2139.scala b/test/files/neg/t2139.scala index 4f09b5a5d..316c0d441 100644 --- a/test/files/neg/t2139.scala +++ b/test/files/neg/t2139.scala @@ -8,7 +8,7 @@ class U { def f[T](x:T):T=x } -object H extends Application { +object H extends App { val u=new U val z:Int=(u.f _)(4) println("done") diff --git a/test/files/neg/t3006.scala b/test/files/neg/t3006.scala index f476c1717..a84b69c84 100755 --- a/test/files/neg/t3006.scala +++ b/test/files/neg/t3006.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { case class A(x: Int); class Foo(a: A) { println("Foo created!"); def +(x: Int) = new A(this.a.x + x); } diff --git a/test/files/neg/t3015.scala b/test/files/neg/t3015.scala index a23e96776..9af8f30c6 100644 --- a/test/files/neg/t3015.scala +++ b/test/files/neg/t3015.scala @@ -2,7 +2,7 @@ class UnApp[P] { def unapply(a: P): Option[P] = Some(a) } -object Test extends Application { +object Test extends App { val b: UnApp[_] = new UnApp[String] val b(foo) = "foo" } diff --git a/test/files/neg/t3224.scala b/test/files/neg/t3224.scala index 6b6ed95bc..774de3335 100755 --- a/test/files/neg/t3224.scala +++ b/test/files/neg/t3224.scala @@ -16,7 +16,7 @@ object Texts{ } } -object Test extends Application { +object Test extends App { implicit def array2list[T](array: Array[T]) = { println(array.toList.size) diff --git a/test/files/neg/unreachablechar.scala b/test/files/neg/unreachablechar.scala index 94438ce32..ed04c5cd3 100644 --- a/test/files/neg/unreachablechar.scala +++ b/test/files/neg/unreachablechar.scala @@ -1,4 +1,4 @@ -object Foo extends Application{ +object Foo extends App{ 'f' match { case 'o'|'c'|'b' => println("Oooo"); case _ => println("stuff"); diff --git a/test/files/neg/volatile-intersection.scala b/test/files/neg/volatile-intersection.scala index 086c474a3..209d13bae 100644 --- a/test/files/neg/volatile-intersection.scala +++ b/test/files/neg/volatile-intersection.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { trait A trait B extends A diff --git a/test/files/neg/volatile.scala b/test/files/neg/volatile.scala index 11f6eb539..829286315 100644 --- a/test/files/neg/volatile.scala +++ b/test/files/neg/volatile.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { trait A trait B extends A diff --git a/test/files/pos/bug0305.scala b/test/files/pos/bug0305.scala index 8935f9a6a..4d37a02eb 100644 --- a/test/files/pos/bug0305.scala +++ b/test/files/pos/bug0305.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { def foo(is:Int*) = 1; def foo(i:Int) = 2; diff --git a/test/files/pos/bug1000.scala b/test/files/pos/bug1000.scala index c6426401a..93f820126 100644 --- a/test/files/pos/bug1000.scala +++ b/test/files/pos/bug1000.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { val xs = Array(1, 2, 3) Console.println(xs.filter(_ >= 0).length) } diff --git a/test/files/pos/bug1006.scala b/test/files/pos/bug1006.scala index 34080b68c..5ebf799d6 100644 --- a/test/files/pos/bug1006.scala +++ b/test/files/pos/bug1006.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { def test() { diff --git a/test/files/pos/bug1014.scala b/test/files/pos/bug1014.scala index fdabc8b67..1ac87b225 100644 --- a/test/files/pos/bug1014.scala +++ b/test/files/pos/bug1014.scala @@ -1,6 +1,6 @@ import scala.xml.{NodeSeq, Elem} -class EO extends Application with Moo{ +class EO extends App with Moo{ def cat = dog implicit def nodeSeqToFlog(in: Elem): Flog = new Flog(in) diff --git a/test/files/pos/bug1075.scala b/test/files/pos/bug1075.scala index 0f518b24d..5f72957da 100644 --- a/test/files/pos/bug1075.scala +++ b/test/files/pos/bug1075.scala @@ -12,6 +12,6 @@ class Directory(var dir_ : String) def dir = dir_ } -object Test extends Directory("/bab/dkkd//dkkdkd//kdkdk") with Application { +object Test extends Directory("/bab/dkkd//dkkdkd//kdkdk") with App { println(dir) } diff --git a/test/files/pos/bug115.scala b/test/files/pos/bug115.scala index e361f0637..0e6a63c16 100644 --- a/test/files/pos/bug115.scala +++ b/test/files/pos/bug115.scala @@ -3,7 +3,7 @@ class S[A](f: A => A, x: A) { } class T[B](f: B => B, y: B) extends S((x: B) => f(x), y) { } -object Test extends Application { +object Test extends App { new T[Int](x => x * 2, 1); val f = new S((x: Int) => x, 1); } diff --git a/test/files/pos/bug1168.scala b/test/files/pos/bug1168.scala index ae0ffb3ca..d9f38714b 100644 --- a/test/files/pos/bug1168.scala +++ b/test/files/pos/bug1168.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { trait SpecialException {} diff --git a/test/files/pos/bug1560.scala b/test/files/pos/bug1560.scala index b1d04153b..4419ae024 100644 --- a/test/files/pos/bug1560.scala +++ b/test/files/pos/bug1560.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { trait C[T] { def t: T } diff --git a/test/files/pos/bug210.scala b/test/files/pos/bug210.scala index 0049d1f34..f0b907aa5 100644 --- a/test/files/pos/bug210.scala +++ b/test/files/pos/bug210.scala @@ -10,7 +10,7 @@ trait Lang2 extends Lang1 { class Eval2 extends Eval1 { self: Visitor => } } /* -object Main with Application { +object Main with App { val lang2 = new Lang2 {} val eval = new lang2.Eval2 } diff --git a/test/files/pos/bug211.scala b/test/files/pos/bug211.scala index 1c2c54934..e394f21e8 100644 --- a/test/files/pos/bug211.scala +++ b/test/files/pos/bug211.scala @@ -1,7 +1,7 @@ trait A; trait B; class Foo extends A with B { self: A with B => } -object Test extends Application { +object Test extends App { new Foo(); Console.println("bug211 completed"); } diff --git a/test/files/pos/bug2168.scala b/test/files/pos/bug2168.scala index d7bfa9687..845c5b736 100644 --- a/test/files/pos/bug2168.scala +++ b/test/files/pos/bug2168.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { def foo1(x: AnyRef) = x match { case x: Function0[_] => x() } def foo2(x: AnyRef) = x match { case x: Function0[Any] => x() } } diff --git a/test/files/pos/bug2187.scala b/test/files/pos/bug2187.scala index 003b8c143..8a3353154 100644 --- a/test/files/pos/bug2187.scala +++ b/test/files/pos/bug2187.scala @@ -1,5 +1,5 @@ // bug #2187 -object Test extends Application { +object Test extends App { def foo(xs:List[String]) = xs match { case Seq(x) => x case Seq(x,y) => "" diff --git a/test/files/pos/bug2261.scala b/test/files/pos/bug2261.scala index a499af838..fcb9821b6 100644 --- a/test/files/pos/bug2261.scala +++ b/test/files/pos/bug2261.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { class Bob[T] implicit def foo2bar[T](xs: List[T]): Bob[T] = new Bob[T] var x: Bob[Int] = null diff --git a/test/files/pos/bug261-ab.scala b/test/files/pos/bug261-ab.scala index 80699e692..df641e811 100644 --- a/test/files/pos/bug261-ab.scala +++ b/test/files/pos/bug261-ab.scala @@ -3,7 +3,7 @@ trait B { private val foo: String = "B" def f = println(foo) } -object Test extends Application with B with A { +object Test extends App with B with A { println(foo) // prints "A", as expected f // prints "B", as expected -} \ No newline at end of file +} diff --git a/test/files/pos/bug261-ba.scala b/test/files/pos/bug261-ba.scala index c66a68d10..6c9c5b10b 100644 --- a/test/files/pos/bug261-ba.scala +++ b/test/files/pos/bug261-ba.scala @@ -3,7 +3,7 @@ trait B { def f = println(foo) } trait A { val foo: String = "A" } -object Test extends Application with B with A { +object Test extends App with B with A { println(foo) // prints "A", as expected f // prints "B", as expected -} \ No newline at end of file +} diff --git a/test/files/pos/bug267.scala b/test/files/pos/bug267.scala index d7eae9b8d..7e5876eae 100644 --- a/test/files/pos/bug267.scala +++ b/test/files/pos/bug267.scala @@ -17,7 +17,7 @@ trait Base { } } -object testBase extends Application with Base { +object testBase extends App with Base { type exp = Exp val term = new Num(2); Console.println(term.eval) diff --git a/test/files/pos/bug342.scala b/test/files/pos/bug342.scala index 29e36415f..752b24d2b 100644 --- a/test/files/pos/bug342.scala +++ b/test/files/pos/bug342.scala @@ -1,4 +1,4 @@ -object Main extends Application { +object Main extends App { object Foo extends Enumeration(0, "Bar") { // 2 val Bar = Value diff --git a/test/files/pos/bug348plus.scala b/test/files/pos/bug348plus.scala index 30fa1576a..e61f7346f 100644 --- a/test/files/pos/bug348plus.scala +++ b/test/files/pos/bug348plus.scala @@ -6,7 +6,7 @@ trait Foo { case class Baz(r:bar) extends Bar; case object NoBar extends Bar; } -object Test extends Application { +object Test extends App { object ConcreteFooBar extends Foo { // if moved to toplevel, it works type bar = Bar; } diff --git a/test/files/pos/bug374.scala b/test/files/pos/bug374.scala index 31a98871a..fb9c0b402 100644 --- a/test/files/pos/bug374.scala +++ b/test/files/pos/bug374.scala @@ -5,7 +5,7 @@ object tokens extends Enumeration { val NAME = Value("name"); } -object test extends AnyRef with Application { +object test extends AnyRef with App { import tokens._; val reserved = new scala.collection.mutable.HashMap[String, Token](); diff --git a/test/files/pos/bug430.scala b/test/files/pos/bug430.scala index 1f7d86b1c..e04e39bea 100644 --- a/test/files/pos/bug430.scala +++ b/test/files/pos/bug430.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { def foo[T <% Ordered[T]](x: T){ Console.println(""+(x < x)+" "+(x <= x)) } def bar(x: Unit ): Unit = foo(x); def bar(x: Boolean): Unit = foo(x); diff --git a/test/files/pos/bug514.scala b/test/files/pos/bug514.scala index 0b7b9ac00..188e4f2e5 100644 --- a/test/files/pos/bug514.scala +++ b/test/files/pos/bug514.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { object Truc { override def toString() = "oui" def toString(bool: Boolean) = "chaispas" diff --git a/test/files/pos/bug531.scala b/test/files/pos/bug531.scala index 26e4df988..02763e08f 100644 --- a/test/files/pos/bug531.scala +++ b/test/files/pos/bug531.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { import scala.reflect._; def titi = { var truc = 0 diff --git a/test/files/pos/bug532.scala b/test/files/pos/bug532.scala index 2c1adfd5b..32649b162 100644 --- a/test/files/pos/bug532.scala +++ b/test/files/pos/bug532.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { import scala.reflect._; def titi: Unit = { var truc = 0 diff --git a/test/files/pos/bug613.scala b/test/files/pos/bug613.scala index 92bdd1b8e..6e3841dad 100644 --- a/test/files/pos/bug613.scala +++ b/test/files/pos/bug613.scala @@ -1,4 +1,4 @@ -class Outer extends Application { +class Outer extends App { val y: Int = 1 abstract class C { val x: Int @@ -11,7 +11,7 @@ class Outer extends Application { } } -object Test extends Application { +object Test extends App { val o = new Outer println(o.foo.x) } diff --git a/test/files/pos/bug675.scala b/test/files/pos/bug675.scala index 3deb7a2b1..c284c0e20 100644 --- a/test/files/pos/bug675.scala +++ b/test/files/pos/bug675.scala @@ -10,7 +10,7 @@ trait T { } } -object Test extends Application { +object Test extends App { val t = new T{} val x = new t.X{} Console.println(x.foo) diff --git a/test/files/pos/bug698.scala b/test/files/pos/bug698.scala index a70acae21..00b370797 100644 --- a/test/files/pos/bug698.scala +++ b/test/files/pos/bug698.scala @@ -6,7 +6,7 @@ abstract class Foo abstract class Bar object Test - extends Foo with Application + extends Foo with App { object x extends Bar } diff --git a/test/files/pos/bug711.scala b/test/files/pos/bug711.scala index 25cd6d3c1..10b410e54 100644 --- a/test/files/pos/bug711.scala +++ b/test/files/pos/bug711.scala @@ -6,7 +6,7 @@ class Button extends Component { abstract class Origin { val delegate: Component } -object main extends Origin with Application { +object main extends Origin with App { val delegate: Component { def sayHey: Unit } = new Button diff --git a/test/files/pos/bug720.scala b/test/files/pos/bug720.scala index beeae371b..ef04d01be 100644 --- a/test/files/pos/bug720.scala +++ b/test/files/pos/bug720.scala @@ -3,7 +3,7 @@ object Conv { implicit def one2two (one: One): Two = new Two } class One extends Conv class Two -object Test2 extends Application { +object Test2 extends App { def fun (two: Two) = () fun(new One) } diff --git a/test/files/pos/bug757.scala b/test/files/pos/bug757.scala index f722128ac..7513910d8 100644 --- a/test/files/pos/bug757.scala +++ b/test/files/pos/bug757.scala @@ -7,7 +7,7 @@ package foo { } package bar { - object Main extends Application { + object Main extends App { foo.C.foo } } diff --git a/test/files/pos/bug759.scala b/test/files/pos/bug759.scala index 2eac89cd6..4fa0ca0b2 100644 --- a/test/files/pos/bug759.scala +++ b/test/files/pos/bug759.scala @@ -1,4 +1,4 @@ -object Test extends Application { +object Test extends App { def f[A](x : => A) = x diff --git a/test/files/pos/bug796.scala b/test/files/pos/bug796.scala index 2e57f6050..066625179 100644 --- a/test/files/pos/bug796.scala +++ b/test/files/pos/bug796.scala @@ -6,7 +6,7 @@ * Ideally, an option in the bugtracking system would automatically * handle "pos" bugs. */ -object Test extends Application { +object Test extends App { object Twice { def apply(x: Int) = x * 2 diff --git a/test/files/pos/bug812.scala b/test/files/pos/bug812.scala index 1c9c923b6..709b59c19 100644 --- a/test/files/pos/bug812.scala +++ b/test/files/pos/bug812.scala @@ -1,7 +1,7 @@ package test; -import scala.{Application => Main}; +import scala.{App => Main}; class Test extends Main { import test.{Test => Hello} - super[Application].main(Array("test")); + super[App].main(Array("test")); private[Test] def xxx = 10; } diff --git a/test/files/pos/channels.scala b/test/files/pos/channels.scala index ce6b79fea..0a2274c47 100644 --- a/test/files/pos/channels.scala +++ b/test/files/pos/channels.scala @@ -11,7 +11,7 @@ object Bang { } */ -object Test extends Application { +object Test extends App { object IC extends Channel[Int] def f[b](x: ![b]): Int = x match { case send: ![c] => @@ -21,7 +21,7 @@ object Test extends Application { } } -object Test2 extends Application { +object Test2 extends App { object IC extends Channel[Set[Int]] def f[b](s: ![b]): Set[Int] = s match { case IC ! x => x diff --git a/test/files/pos/comp-rec-test.scala b/test/files/pos/comp-rec-test.scala index eaf12942c..c3e6f8c19 100644 --- a/test/files/pos/comp-rec-test.scala +++ b/test/files/pos/comp-rec-test.scala @@ -1,4 +1,4 @@ -object Comp extends Application { +object Comp extends App { trait Family { type T diff --git a/test/files/pos/constfold.scala b/test/files/pos/constfold.scala index d42ada76d..8d431efba 100644 --- a/test/files/pos/constfold.scala +++ b/test/files/pos/constfold.scala @@ -5,7 +5,7 @@ object A { val s = "z is " + z; } -object Test extends Application { +object Test extends App { Console.println(A.x); Console.println(A.y); diff --git a/test/files/pos/gosh.scala b/test/files/pos/gosh.scala index af49cbf16..427df4d33 100644 --- a/test/files/pos/gosh.scala +++ b/test/files/pos/gosh.scala @@ -1,4 +1,4 @@ -object ShapeTest extends Application { +object ShapeTest extends App { class Point(x: Int, y: Int) { override def toString() = "[" + x + "," + y + "]" diff --git a/test/files/pos/gui.scala b/test/files/pos/gui.scala index 5070339f4..322e0a6e2 100644 --- a/test/files/pos/gui.scala +++ b/test/files/pos/gui.scala @@ -82,18 +82,18 @@ object GUI { object GUIClient { - class Application { + class App { def quit() { Console.println("application exited") } } - class QuitButton (scr: Screen, p: Geom.Point, name: String, a: Application) + class QuitButton (scr: Screen, p: Geom.Point, name: String, a: App) extends GUI.Button(scr, p, name) { def doit() { a.quit() } } def main(args: Array[String]) { val b = new QuitButton( - DummyScreen, Geom.Point(1, 1), "quit", new Application); + DummyScreen, Geom.Point(1, 1), "quit", new App); b.draw(); b.enable(true).mouseDown(Geom.Point(1, 2)); } diff --git a/test/files/pos/init.scala b/test/files/pos/init.scala index c51446c80..fdea0e06f 100644 --- a/test/files/pos/init.scala +++ b/test/files/pos/init.scala @@ -8,7 +8,7 @@ class Foo { } } -object Test extends Application { +object Test extends App { val foo = new Foo Console.println((new foo.Bar).id) } diff --git a/test/files/pos/lexical.scala b/test/files/pos/lexical.scala index 034b84bf0..8c29513bb 100755 --- a/test/files/pos/lexical.scala +++ b/test/files/pos/lexical.scala @@ -3,7 +3,7 @@ class RichInt(n: Int) { def days = 1000*60*60*24*n } -object Test extends Application { +object Test extends App { implicit def RichInt(n: Int): RichInt = new RichInt(n) println(10.days) } diff --git a/test/files/pos/pos-bug1241.scala b/test/files/pos/pos-bug1241.scala index 333e6c549..1752208f3 100644 --- a/test/files/pos/pos-bug1241.scala +++ b/test/files/pos/pos-bug1241.scala @@ -1,4 +1,4 @@ -object test extends Application { +object test extends App { // more.. type T = { def hello() } //val x4 = new AnyRef { def hello() { println("4") } } // ok! diff --git a/test/files/pos/scoping1.scala b/test/files/pos/scoping1.scala index e695110c1..548f154b6 100644 --- a/test/files/pos/scoping1.scala +++ b/test/files/pos/scoping1.scala @@ -1,4 +1,4 @@ -object This extends Application { +object This extends App { trait A { def foo(): Unit } diff --git a/test/files/pos/spec-Function1.scala b/test/files/pos/spec-Function1.scala index 9697adf76..7bdcd072b 100644 --- a/test/files/pos/spec-Function1.scala +++ b/test/files/pos/spec-Function1.scala @@ -20,7 +20,7 @@ package scala * anonfun1: *

* 
- *  object Main extends Application {
+ *  object Main extends App {
  *
  *    val succ = (x: Int) => x + 1
  *
diff --git a/test/files/pos/spec-lists.scala b/test/files/pos/spec-lists.scala
index 01416da95..46e164e9c 100644
--- a/test/files/pos/spec-lists.scala
+++ b/test/files/pos/spec-lists.scala
@@ -1,4 +1,4 @@
-object Main extends Application {
+object Main extends App {
 
   val xs = 1 :: 2 :: 3 :: 4 :: 5 :: Nil
 
diff --git a/test/files/pos/spec-sealed.scala b/test/files/pos/spec-sealed.scala
index 73256ac90..578293089 100644
--- a/test/files/pos/spec-sealed.scala
+++ b/test/files/pos/spec-sealed.scala
@@ -18,7 +18,7 @@ case class Cons[@specialized a](private val hd: a, tl: MyList[a]) extends MyList
 
 abstract class IntList extends MyList[Int]
 
-object Main extends Application {
+object Main extends App {
   val xs = 1 :: 2 :: 3 :: MyNil 
   println(xs)
 }
diff --git a/test/files/pos/sudoku.scala b/test/files/pos/sudoku.scala
index be0566580..336dc756a 100644
--- a/test/files/pos/sudoku.scala
+++ b/test/files/pos/sudoku.scala
@@ -1,4 +1,4 @@
-object SudokuSolver extends Application {
+object SudokuSolver extends App {
   // The board is represented by an array of strings (arrays of chars),
   // held in a global variable m. The program begins by reading 9 lines
   // of input to fill the board
diff --git a/test/files/pos/t0231.scala b/test/files/pos/t0231.scala
index 895e78042..17a2eb1c5 100644
--- a/test/files/pos/t0231.scala
+++ b/test/files/pos/t0231.scala
@@ -11,7 +11,7 @@ class Bar extends Foo {
   }
 }
 
-object bug extends Application {
+object bug extends App {
   new Bar
   ()
 }
diff --git a/test/files/pos/t0651.scala b/test/files/pos/t0651.scala
index 76d5df9f9..52bef7e02 100644
--- a/test/files/pos/t0651.scala
+++ b/test/files/pos/t0651.scala
@@ -1,4 +1,4 @@
-object Reflection1 extends Application {
+object Reflection1 extends App {
   case class Element(name: String)
   println(reflect.Code.lift({val e = Element("someName"); e}).tree)
 }
diff --git a/test/files/pos/t0674.scala b/test/files/pos/t0674.scala
index 6884d84be..589eeec9f 100644
--- a/test/files/pos/t0674.scala
+++ b/test/files/pos/t0674.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 println(
 for(a <- Some(1);
     b <- Some(2);
diff --git a/test/files/pos/t1027.scala b/test/files/pos/t1027.scala
index 7854041f1..02ba9a8a3 100644
--- a/test/files/pos/t1027.scala
+++ b/test/files/pos/t1027.scala
@@ -1,4 +1,4 @@
-object T1027 extends Application {
+object T1027 extends App {
   trait Comparable[T <: Comparable[T]] { this: T =>
     def < (that: T): Boolean
     def <=(that: T): Boolean = this < that || this == that
diff --git a/test/files/pos/t1545.scala b/test/files/pos/t1545.scala
index d52cfa165..51df606da 100755
--- a/test/files/pos/t1545.scala
+++ b/test/files/pos/t1545.scala
@@ -1,4 +1,4 @@
-object Main extends Application {
+object Main extends App {
 
     case class Foo (field : Option[String])
 
diff --git a/test/files/pos/t1560.scala b/test/files/pos/t1560.scala
index c1d8a8164..fb5592016 100644
--- a/test/files/pos/t1560.scala
+++ b/test/files/pos/t1560.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   
   trait C[T] {
     def t: T
diff --git a/test/files/pos/t1756.scala b/test/files/pos/t1756.scala
index 7aea525f6..2e09c8a94 100755
--- a/test/files/pos/t1756.scala
+++ b/test/files/pos/t1756.scala
@@ -34,7 +34,7 @@ class Poly[C <: Ring[C]](val c: C) extends Ring[Poly[C]] {
   def *(that: Poly[C]) = new Poly(this.c*that.c)
 }
 
-object Test extends Application {
+object Test extends App {
   
   implicit def coef2poly[C <: Ring[C]](c: C): Poly[C] = new Poly(c)
 
diff --git a/test/files/pos/t2234.scala b/test/files/pos/t2234.scala
index cea657b16..218e9f5e5 100644
--- a/test/files/pos/t2234.scala
+++ b/test/files/pos/t2234.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val res0 = 1 #:: Stream.empty
   res0 match { case 1 #:: xs => xs }
 }
diff --git a/test/files/pos/t2425.scala b/test/files/pos/t2425.scala
index 403f1a18d..477d5467a 100755
--- a/test/files/pos/t2425.scala
+++ b/test/files/pos/t2425.scala
@@ -1,6 +1,6 @@
 trait B
 class D extends B
-object Test extends Application {
+object Test extends App {
   def foo[T](bar: T) = {
     bar match {
       case _: Array[Array[_]] => println("array 2d")
diff --git a/test/files/pos/tcpoly_infer_ticket1864.scala b/test/files/pos/tcpoly_infer_ticket1864.scala
index 587483287..77d20234d 100644
--- a/test/files/pos/tcpoly_infer_ticket1864.scala
+++ b/test/files/pos/tcpoly_infer_ticket1864.scala
@@ -9,7 +9,7 @@ class RichBuffer[T, B[U] <: Buffer[U]](buffer: Buffer[T]) {
   }
 }
 
-object Application {
+object App {
   def mymap2[T, B[U] <: Buffer[U], S](buffer: B[T], f: T => S)(implicit rv: B[S]): B[S] = {
     buffer.foreach{ e =>
       rv += f(e)
diff --git a/test/files/pos/tcpoly_infer_ticket716.scala b/test/files/pos/tcpoly_infer_ticket716.scala
index cfba07fa4..24e8f663b 100644
--- a/test/files/pos/tcpoly_infer_ticket716.scala
+++ b/test/files/pos/tcpoly_infer_ticket716.scala
@@ -18,9 +18,9 @@ object Functor{
   //implicit def liftListtoOO[A](arg:List[A]):OOFunctor[List,A] = new OOFunctor[List,A](arg)
 }
 
-object GeneralLiftingDemo extends Application {
+object GeneralLiftingDemo extends App {
   import Functor._
   val l = List(1,2,3)
   val res = l fmap( 1+) // TODO: should not need explicit call to lifttoOO
   println("OO : " + res )
-}
\ No newline at end of file
+}
diff --git a/test/files/pos/typerep-stephane.scala b/test/files/pos/typerep-stephane.scala
index 106121236..2cb899591 100644
--- a/test/files/pos/typerep-stephane.scala
+++ b/test/files/pos/typerep-stephane.scala
@@ -41,7 +41,7 @@ object typerep {
 
 }
 
-object test extends Application {
+object test extends App {
  import typerep._
  println(3.getType)
  println(List(3).getType)
diff --git a/test/files/pos/typerep_pos.scala b/test/files/pos/typerep_pos.scala
index 7faa8a192..ebb643d32 100644
--- a/test/files/pos/typerep_pos.scala
+++ b/test/files/pos/typerep_pos.scala
@@ -1,4 +1,4 @@
-object typerep extends Application {
+object typerep extends App {
   class TypeRep[T] {}
   case object IntRep extends TypeRep[Int] {
     override def toString = "Int"
diff --git a/test/files/pos/unapplyVal.scala b/test/files/pos/unapplyVal.scala
index 10a6ba7c2..0d6394a90 100644
--- a/test/files/pos/unapplyVal.scala
+++ b/test/files/pos/unapplyVal.scala
@@ -18,7 +18,7 @@ class Buffer {
 }
 
 
-object unapplyJoins extends Application { // bug #1257
+object unapplyJoins extends App { // bug #1257
 
   class Sync {
     def apply(): Int = 42
diff --git a/test/files/run/OrderingTest.scala b/test/files/run/OrderingTest.scala
index a3eca5f86..53448fbbc 100644
--- a/test/files/run/OrderingTest.scala
+++ b/test/files/run/OrderingTest.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def test[T](t1 : T, t2 : T)(implicit ord : Ordering[T]) = {
     val cmp = ord.compare(t1, t2);
     val cmp2 = ord.compare(t2, t1);
diff --git a/test/files/run/ReverseSeqView.scala b/test/files/run/ReverseSeqView.scala
index 88394064c..517f1cc24 100644
--- a/test/files/run/ReverseSeqView.scala
+++ b/test/files/run/ReverseSeqView.scala
@@ -4,7 +4,7 @@
 
 
 
-object Test extends Application {
+object Test extends App {
   
   val lstv = List(1, 2, 3).view
   val lstvr = lstv.reverse
diff --git a/test/files/run/amp.scala b/test/files/run/amp.scala
index 367f3b31e..a1924ef63 100644
--- a/test/files/run/amp.scala
+++ b/test/files/run/amp.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   def foo() = {
     def f: Int = 1
diff --git a/test/files/run/arrayclone.scala b/test/files/run/arrayclone.scala
index 55d8fc395..c9f7556b4 100644
--- a/test/files/run/arrayclone.scala
+++ b/test/files/run/arrayclone.scala
@@ -1,4 +1,4 @@
-object Test extends Application{
+object Test extends App{
   BooleanArrayClone;
   ByteArrayClone;
   ShortArrayClone;
diff --git a/test/files/run/arybufgrow.scala b/test/files/run/arybufgrow.scala
index 9e1843524..fba859a45 100644
--- a/test/files/run/arybufgrow.scala
+++ b/test/files/run/arybufgrow.scala
@@ -1,6 +1,6 @@
 import scala.collection.mutable._;
 
-object Test extends Application {
+object Test extends App {
   val buf = new ArrayBuffer[String];
   for (i <- List.range(0,1000)) {
     buf += "hello";
diff --git a/test/files/run/bitsets.scala b/test/files/run/bitsets.scala
index ac2b8eb5b..a847c9940 100644
--- a/test/files/run/bitsets.scala
+++ b/test/files/run/bitsets.scala
@@ -69,7 +69,7 @@ object TestImmutable {
   Console.println
 }
 
-object Test extends Application {
+object Test extends App {
   TestMutable
   TestImmutable
 }
diff --git a/test/files/run/breakout.scala b/test/files/run/breakout.scala
index 01ea08846..8081405bd 100644
--- a/test/files/run/breakout.scala
+++ b/test/files/run/breakout.scala
@@ -2,8 +2,8 @@ import scala.collection.generic._
 import scala.collection._
 import scala.collection.mutable._
 
-object Test extends Application {
+object Test extends App {
 	val l = List(1, 2, 3)
 	val a: Array[Int] =  l.map(_ + 1)(breakOut)
 	println(a.mkString(", "))
-}
\ No newline at end of file
+}
diff --git a/test/files/run/bug1042.scala b/test/files/run/bug1042.scala
index 32eb49a7e..1f39fff24 100644
--- a/test/files/run/bug1042.scala
+++ b/test/files/run/bug1042.scala
@@ -9,6 +9,6 @@ case class B() extends A {
   def toString(sb: StringBuilder): StringBuilder = error("")
 }
 
-object Test extends Application {
+object Test extends App {
   Console.println(B)
 }
diff --git a/test/files/run/bug1044.scala b/test/files/run/bug1044.scala
index da2043982..7ac505860 100644
--- a/test/files/run/bug1044.scala
+++ b/test/files/run/bug1044.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val ducks = Array[AnyRef]("Huey", "Dewey", "Louie");
   ducks.elements.asInstanceOf[Iterator[String]]
 }
diff --git a/test/files/run/bug1079.scala b/test/files/run/bug1079.scala
index ae8234bfe..ce435d254 100644
--- a/test/files/run/bug1079.scala
+++ b/test/files/run/bug1079.scala
@@ -1,3 +1,3 @@
-object Test extends Application {
+object Test extends App {
   println( == )
 }
diff --git a/test/files/run/bug1110.scala b/test/files/run/bug1110.scala
index 092bc8536..824643868 100644
--- a/test/files/run/bug1110.scala
+++ b/test/files/run/bug1110.scala
@@ -6,6 +6,6 @@ class Stuff {
   assert(zoop(10) == 2)
 }
 
-object Test extends Application {
+object Test extends App {
   new Stuff
 }
diff --git a/test/files/run/bug1141.scala b/test/files/run/bug1141.scala
index 7de031366..ee4f2e7fd 100644
--- a/test/files/run/bug1141.scala
+++ b/test/files/run/bug1141.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val foo = new {
     def apply(args : String*) = args foreach println
   }
diff --git a/test/files/run/bug1192.scala b/test/files/run/bug1192.scala
index c19919893..a32cbf5c9 100644
--- a/test/files/run/bug1192.scala
+++ b/test/files/run/bug1192.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val v1: Array[Array[Int]] = Array(Array(1, 2), Array(3, 4))
   def f[T](w: Array[Array[T]]) {
     for (val r <- w) println(r.deep.toString)
diff --git a/test/files/run/bug1220.scala b/test/files/run/bug1220.scala
index 165a1c0ec..0ba188d02 100644
--- a/test/files/run/bug1220.scala
+++ b/test/files/run/bug1220.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   class QSRichIterable[A](self: Iterable[A]) {
     def filterMap[R](f: PartialFunction[A,R]) = 
diff --git a/test/files/run/bug1300.scala b/test/files/run/bug1300.scala
index 7b2fd79ce..ce2f80eb4 100644
--- a/test/files/run/bug1300.scala
+++ b/test/files/run/bug1300.scala
@@ -1,4 +1,4 @@
-object Test extends Application
+object Test extends App
 {
   val a1 = Array(0,1,2,3).toArray[Any]
 //  val a1 = x1.toArray[Any]
diff --git a/test/files/run/bug1373.scala b/test/files/run/bug1373.scala
index 537421c78..d6f9c1ee1 100644
--- a/test/files/run/bug1373.scala
+++ b/test/files/run/bug1373.scala
@@ -1,6 +1,6 @@
 // Testing whether case class params come back in the right order.
-object Test extends Application {
+object Test extends App {
   case class Foo(private val a: String, b: String, private val c: String, d: String, private val e: String)
   val x = Foo("a", "b", "c", "d", "e")
   assert(x.toString == """Foo(a,b,c,d,e)""")
-}
\ No newline at end of file
+}
diff --git a/test/files/run/bug1466.scala b/test/files/run/bug1466.scala
index fdbb5cb91..c59a38859 100644
--- a/test/files/run/bug1466.scala
+++ b/test/files/run/bug1466.scala
@@ -6,6 +6,6 @@ object IOvervalueMyPrivacy {
   }
 }
 
-object Test extends Application {
+object Test extends App {
   assert(IOvervalueMyPrivacy.go == 6)
 }
diff --git a/test/files/run/bug1766.scala b/test/files/run/bug1766.scala
index 94f69356e..2afd88375 100644
--- a/test/files/run/bug1766.scala
+++ b/test/files/run/bug1766.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   
   class C(s: String) {
   
diff --git a/test/files/run/bug2075.scala b/test/files/run/bug2075.scala
index f328faddc..e3a68e4a8 100644
--- a/test/files/run/bug2075.scala
+++ b/test/files/run/bug2075.scala
@@ -1,7 +1,7 @@
-object Test extends Application {
+object Test extends App {
   var tm = new scala.collection.immutable.TreeMap[Int,Int]
   for (i <- 0 to 100)
     tm = tm.insert(i, i)
 
   tm.keySet.filter(_ < 40)
-}
\ No newline at end of file
+}
diff --git a/test/files/run/bug216.scala b/test/files/run/bug216.scala
index b046f51f4..916a3c582 100644
--- a/test/files/run/bug216.scala
+++ b/test/files/run/bug216.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   object m {
     val f = { x: Unit => () }
     Console.println("OK")
diff --git a/test/files/run/bug2241.scala b/test/files/run/bug2241.scala
index 53a0d708e..4a8a662b8 100644
--- a/test/files/run/bug2241.scala
+++ b/test/files/run/bug2241.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def f(a:Array[Int]) = a match {
     case Array(1, _*) => "yes"
     case _ => "no"
diff --git a/test/files/run/bug2276.scala b/test/files/run/bug2276.scala
index 68b997635..f0404e5fa 100644
--- a/test/files/run/bug2276.scala
+++ b/test/files/run/bug2276.scala
@@ -1,7 +1,7 @@
 import scala.xml._
 import scala.xml.transform._
 
-object Test extends Application {
+object Test extends App {
   val inputXml : Node = 
     
       
diff --git a/test/files/run/bug2552.scala b/test/files/run/bug2552.scala
index 34fe25084..17dcac596 100644
--- a/test/files/run/bug2552.scala
+++ b/test/files/run/bug2552.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 	def testTakeWhile = {
 		val numbers = Iterator.range(0, 50)
 		val zeroTo9 = numbers.takeWhile(x => { println("p(" + x + ")"); x < 10 } )
diff --git a/test/files/run/bug298.scala b/test/files/run/bug298.scala
index c6179f1b2..bfc219ec5 100644
--- a/test/files/run/bug298.scala
+++ b/test/files/run/bug298.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   implicit def anyList[T]: List[T] = Nil
 
   implicit def intList: List[Int] = 42::24::Nil
@@ -14,4 +14,4 @@ object Test extends Application {
   val t = foo[List[Tuple2[Int,Int]]]
 
   println(t)  // incorrect - prints "List()"
-}
\ No newline at end of file
+}
diff --git a/test/files/run/bug405.scala b/test/files/run/bug405.scala
index a1e386449..e736fc1e5 100644
--- a/test/files/run/bug405.scala
+++ b/test/files/run/bug405.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val x = M;
   object M;
   assert(x eq M)
diff --git a/test/files/run/bug657.scala b/test/files/run/bug657.scala
index 931f62b1a..a9726092e 100644
--- a/test/files/run/bug657.scala
+++ b/test/files/run/bug657.scala
@@ -44,7 +44,7 @@ class Test1 extends OffsetList with Matcher {
   type Matchable = MatchableImpl;
 }
 
-object Test extends Application {
+object Test extends App {
   val test = new Test1;
   val m = new test.MatchableImpl;
   m.chop;
diff --git a/test/files/run/bug889.scala b/test/files/run/bug889.scala
index db6076e8e..c2c173081 100644
--- a/test/files/run/bug889.scala
+++ b/test/files/run/bug889.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   val a = List("a")
 
diff --git a/test/files/run/bug949.scala b/test/files/run/bug949.scala
index 216e92a1c..a9c5d08c5 100644
--- a/test/files/run/bug949.scala
+++ b/test/files/run/bug949.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
     private def f = new T { val state = State.A }
 
diff --git a/test/files/run/bug978.scala b/test/files/run/bug978.scala
index a2df87b0e..3ffac9276 100644
--- a/test/files/run/bug978.scala
+++ b/test/files/run/bug978.scala
@@ -8,7 +8,7 @@ class Foo(val n: Int) {
   override def toString = "" + n
 }
 
-object Test extends Application {
+object Test extends App {
   val set = new collection.mutable.HashSet[Foo]
 //  val set = new collection.jcl.HashSet[Foo]
 
diff --git a/test/files/run/byname.scala b/test/files/run/byname.scala
index af545d5e7..8aff1ec23 100644
--- a/test/files/run/byname.scala
+++ b/test/files/run/byname.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
 def test[A](name: String, expect: A, actual: => A) {
     if (expect != actual) throw new AssertionError("test " + name + " failed")
diff --git a/test/files/run/caseclasses.scala b/test/files/run/caseclasses.scala
index ed5643a70..5aafea59e 100644
--- a/test/files/run/caseclasses.scala
+++ b/test/files/run/caseclasses.scala
@@ -15,7 +15,7 @@ object M {
   }
 }
 
-object Test extends Application {
+object Test extends App {
 
   def Abs(x: Int) = new Abs(x * 2){}
   Abs(2) match {
diff --git a/test/files/run/castsingleton.scala b/test/files/run/castsingleton.scala
index 3921696ef..47bd61307 100644
--- a/test/files/run/castsingleton.scala
+++ b/test/files/run/castsingleton.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   case class L();
   object N extends L();
 
diff --git a/test/files/run/checked.scala b/test/files/run/checked.scala
index 4a79aa2b9..06bc0c05e 100644
--- a/test/files/run/checked.scala
+++ b/test/files/run/checked.scala
@@ -90,7 +90,7 @@ class TestInterference extends {
 }
 
 
-object Test extends Application {
+object Test extends App {
   
   def shouldThrow(t: => Unit) = try {
     t
diff --git a/test/files/run/collections.scala b/test/files/run/collections.scala
index 2bbeed00d..60f0765e6 100644
--- a/test/files/run/collections.scala
+++ b/test/files/run/collections.scala
@@ -1,7 +1,7 @@
 import collection._
 import scala.compat.Platform.currentTime
 
-object Test extends Application {
+object Test extends App {
 
   val printTime = false
 
diff --git a/test/files/run/colltest.scala b/test/files/run/colltest.scala
index b635c4e53..ecd234bdd 100644
--- a/test/files/run/colltest.scala
+++ b/test/files/run/colltest.scala
@@ -45,7 +45,7 @@ class TestSet(s0: Set[Int], s1: Set[Int]) {
   }
   Console.println("succeeded for "+Iterations+" iterations.")
 }
-object Test extends Application {
+object Test extends App {
   def t3954 {
     import scala.collection.mutable
     import scala.collection.immutable
diff --git a/test/files/run/colltest1.scala b/test/files/run/colltest1.scala
index a50584705..1cbd93222 100644
--- a/test/files/run/colltest1.scala
+++ b/test/files/run/colltest1.scala
@@ -1,6 +1,6 @@
 import collection._
 
-object Test extends Application {
+object Test extends App {
 
   def orderedTraversableTest(empty: Traversable[Int]) {
     println("new test starting with "+empty)
diff --git a/test/files/run/complicatedmatch.scala b/test/files/run/complicatedmatch.scala
index c837c328b..681029aa1 100644
--- a/test/files/run/complicatedmatch.scala
+++ b/test/files/run/complicatedmatch.scala
@@ -6,7 +6,7 @@ object Even{
   def unapply(x : Int) = if (x % 2 == 0) Some(x / 2) else None;
 }
 
-object Test extends Application{
+object Test extends App{
   val LongWord = "supercalifragilisticexpialadocious";
 
   def foo(x : Int, y : String) : Int = (x, y) match {
diff --git a/test/files/run/contrib674.scala b/test/files/run/contrib674.scala
index 5e43560b7..f6b46d13c 100644
--- a/test/files/run/contrib674.scala
+++ b/test/files/run/contrib674.scala
@@ -1,6 +1,6 @@
 // causes VerifyError with scala-2.5.1
 
-object Test extends Application {
+object Test extends App {
   def bad() {
     try {
       1
diff --git a/test/files/run/ctor-order.scala b/test/files/run/ctor-order.scala
index b32f005d7..a223ff77e 100644
--- a/test/files/run/ctor-order.scala
+++ b/test/files/run/ctor-order.scala
@@ -21,7 +21,7 @@ class Outer {
 
 }
 
-object Test extends AnyRef with Application {
+object Test extends AnyRef with App {
   val o = new Outer;
 
   new o.X;
diff --git a/test/files/run/exc.scala b/test/files/run/exc.scala
index 4c7db2922..6457af1e1 100644
--- a/test/files/run/exc.scala
+++ b/test/files/run/exc.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def foo() = {
     while (true) {
       try {
diff --git a/test/files/run/exc1.scala b/test/files/run/exc1.scala
index 24856247b..9008f9d14 100644
--- a/test/files/run/exc1.scala
+++ b/test/files/run/exc1.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def foo(): Unit = {
     while (true) {
       try {
diff --git a/test/files/run/exc2.scala b/test/files/run/exc2.scala
index 00a269a36..bb41f5286 100644
--- a/test/files/run/exc2.scala
+++ b/test/files/run/exc2.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def foo() = {
     while (true) {
       try {
diff --git a/test/files/run/exceptions-nest.scala b/test/files/run/exceptions-nest.scala
index d3f37452b..841e6b1c6 100644
--- a/test/files/run/exceptions-nest.scala
+++ b/test/files/run/exceptions-nest.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   println(test1)
   println(test2)
diff --git a/test/files/run/existentials.scala b/test/files/run/existentials.scala
index 4f6388829..3977d4741 100644
--- a/test/files/run/existentials.scala
+++ b/test/files/run/existentials.scala
@@ -50,7 +50,7 @@ object Bug1189 {
   println(f(x))
 }
 
-object Test extends Application {
+object Test extends App {
 
   val x = { class I; class J; (new C(new I), new C(new J)) }
   val y: (C[X], C[Y]) forSome { type X; type Y } = x
diff --git a/test/files/run/exoticnames.scala b/test/files/run/exoticnames.scala
index 9250d62dd..fa0e5e6ec 100644
--- a/test/files/run/exoticnames.scala
+++ b/test/files/run/exoticnames.scala
@@ -1,5 +1,5 @@
 // this is a run-test because the compiler should emit bytecode that'll pass the JVM's verifier
-object Test extends Application {
+object Test extends App {
   def `(` = error("bla")
   def `.` = error("bla")
   def `)` = error("bla")
diff --git a/test/files/run/finally.scala b/test/files/run/finally.scala
index 6d8d360d3..e4715c59a 100644
--- a/test/files/run/finally.scala
+++ b/test/files/run/finally.scala
@@ -1,6 +1,6 @@
 
 // test that finally is not covered by any exception handlers.
-object Test extends Application {
+object Test extends App {
   def bar {
     try {
       println("hi")
diff --git a/test/files/run/fors.scala b/test/files/run/fors.scala
index 2cd4cf135..c7682f563 100644
--- a/test/files/run/fors.scala
+++ b/test/files/run/fors.scala
@@ -4,7 +4,7 @@
 
 //############################################################################
 
-object Test extends Application {
+object Test extends App {
   val xs = List(1, 2, 3)
   val ys = List('a, 'b, 'c)
 
diff --git a/test/files/run/gadts.scala b/test/files/run/gadts.scala
index 697df4c1b..4ab3ef681 100644
--- a/test/files/run/gadts.scala
+++ b/test/files/run/gadts.scala
@@ -6,7 +6,7 @@ case class If[T](c: Term[Boolean],
                  t1: Term[T], 
                  t2: Term[T]) extends Term[T]
 
-object Test extends Application {
+object Test extends App {
   def eval[T](t: Term[T]): T = t match {
     case Lit(n)        => n
     case Succ(u)       => eval(u) + 1
diff --git a/test/files/run/implicits.scala b/test/files/run/implicits.scala
index e55457528..a30f60f6d 100644
--- a/test/files/run/implicits.scala
+++ b/test/files/run/implicits.scala
@@ -15,7 +15,7 @@ class C(x: String) {
   }
 }
 
-object Test extends Application {
+object Test extends App {
   import A.B._
   val c = new C("OK")
   val i = new c.Inner
diff --git a/test/files/run/infiniteloop.scala b/test/files/run/infiniteloop.scala
index f15674a67..06926cec1 100644
--- a/test/files/run/infiniteloop.scala
+++ b/test/files/run/infiniteloop.scala
@@ -1,6 +1,6 @@
 /** Tests the optimiser (not to loop on 'reverse'). */
 
-object Test extends Application {
+object Test extends App {
   def foo {
     val s3 = Stream.range(1, 1000) //100000 (ticket #153: Stackoverflow)
 
diff --git a/test/files/run/infix.scala b/test/files/run/infix.scala
index 66a41f66f..700e4347a 100644
--- a/test/files/run/infix.scala
+++ b/test/files/run/infix.scala
@@ -2,7 +2,7 @@ case class op(x: op, y: Int, z: Int) {
   def op(y: Int, z: Int) = new op(this, y, z)
 }
 
-object Test extends Application {
+object Test extends App {
   val xs = new op(null, 0, 0) op (1, 1) op (2, 2)
   Console.println(xs)
   xs match {
diff --git a/test/files/run/inliner-infer.scala b/test/files/run/inliner-infer.scala
index 2c818c4a4..ea83966c5 100644
--- a/test/files/run/inliner-infer.scala
+++ b/test/files/run/inliner-infer.scala
@@ -3,7 +3,7 @@
 /** Test that the inliner is not inferring that `xs' is
  *  always Nil, removing the call to isEmpty.
  */
-object Test extends Application {
+object Test extends App {
 
   @annotation.tailrec
   def walk(xs: MyList): Unit = {
diff --git a/test/files/run/intmap.scala b/test/files/run/intmap.scala
index 8c3e0b2ca..c5f8d7d3d 100644
--- a/test/files/run/intmap.scala
+++ b/test/files/run/intmap.scala
@@ -1,4 +1,4 @@
-object Test extends Application{
+object Test extends App{
   import scala.collection.immutable.IntMap;
 
   val it = IntMap(8 -> 2, 11 -> 3, 1 -> 2, 7 -> 13);
diff --git a/test/files/run/issue192.scala b/test/files/run/issue192.scala
index 32e203a4e..d8db8b581 100644
--- a/test/files/run/issue192.scala
+++ b/test/files/run/issue192.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   
   def f1(p: Any{def unary_+ : Int}) = +p
   def f2(p: Any{def unary_- : Int}) = -p
diff --git a/test/files/run/iterables.scala b/test/files/run/iterables.scala
index 5334b456f..ad30f4731 100644
--- a/test/files/run/iterables.scala
+++ b/test/files/run/iterables.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   class Test(n: Int) extends Iterable[Int] {
     private var i = 0
     def iterator = new Iterator[Int] {
diff --git a/test/files/run/json.scala b/test/files/run/json.scala
index fb7abcf87..bdddcfd18 100644
--- a/test/files/run/json.scala
+++ b/test/files/run/json.scala
@@ -1,7 +1,7 @@
 import scala.util.parsing.json._
 import scala.collection.immutable.TreeMap
 
-object Test extends Application {
+object Test extends App {
   /* This method converts parsed JSON back into real JSON notation with objects in
    * sorted-key order. Not required by the spec, but it allows us to to a stable
    * toString comparison. */
diff --git a/test/files/run/lazy-exprs.scala b/test/files/run/lazy-exprs.scala
index d4913c78d..fc724bd10 100644
--- a/test/files/run/lazy-exprs.scala
+++ b/test/files/run/lazy-exprs.scala
@@ -89,7 +89,7 @@ object TestExpressions {
 }
 
 
-object Test extends Application {
+object Test extends App {
 
   TestExpressions.test
 }
diff --git a/test/files/run/lazy-leaks.scala b/test/files/run/lazy-leaks.scala
index e7073b5b6..e3db55aa0 100644
--- a/test/files/run/lazy-leaks.scala
+++ b/test/files/run/lazy-leaks.scala
@@ -2,7 +2,7 @@ class Lazy(f: => Int) {
      lazy val get: Int = f
 }
 
-object Test extends Application
+object Test extends App
 {
      val buffer = new scala.collection.mutable.ListBuffer[Lazy]
 
diff --git a/test/files/run/lazy-locals.scala b/test/files/run/lazy-locals.scala
index a6e607bcf..696aeeba9 100644
--- a/test/files/run/lazy-locals.scala
+++ b/test/files/run/lazy-locals.scala
@@ -1,5 +1,5 @@
 
-object Test extends Application {
+object Test extends App {
 
   lazy val w = 10
 
diff --git a/test/files/run/lazy-override-run.scala b/test/files/run/lazy-override-run.scala
index fe2c85bda..d19740877 100644
--- a/test/files/run/lazy-override-run.scala
+++ b/test/files/run/lazy-override-run.scala
@@ -13,7 +13,7 @@ class B extends A {
 
 
 
-object Test extends Application {
+object Test extends App {
  val a = new A
  print("a.x=")
  println(a.x)
diff --git a/test/files/run/lazy-traits.scala b/test/files/run/lazy-traits.scala
index e3fb37af8..f04c0b8b1 100644
--- a/test/files/run/lazy-traits.scala
+++ b/test/files/run/lazy-traits.scala
@@ -153,7 +153,7 @@ class MixedUnitLazy extends UnitLazy with UnitLazyT {
   }
 }
 
-object Test extends Application {
+object Test extends App {
 
   def test(name: String, v: A) {
     println(name + " test:")
diff --git a/test/files/run/map_test.scala b/test/files/run/map_test.scala
index 4358878a8..9f83a3f49 100644
--- a/test/files/run/map_test.scala
+++ b/test/files/run/map_test.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.{ListMap, Map, TreeMap}
 
-object Test extends Application {
+object Test extends App {
   test1()
   test2()
   println("OK")
diff --git a/test/files/run/matcharraytail.scala b/test/files/run/matcharraytail.scala
index 0ee95bc01..24a8dd12b 100644
--- a/test/files/run/matcharraytail.scala
+++ b/test/files/run/matcharraytail.scala
@@ -1,4 +1,4 @@
-object Test extends Application{
+object Test extends App{
   Array("foo", "bar", "baz") match {
     case x@Array("foo", bar @_*) => println(x.deep.toString); println(bar.toString);
     case Array(x, y, z) => println("shouldn't have fallen through");
diff --git a/test/files/run/matchbytes.scala b/test/files/run/matchbytes.scala
index e776f0bf8..7190886ba 100644
--- a/test/files/run/matchbytes.scala
+++ b/test/files/run/matchbytes.scala
@@ -1,4 +1,4 @@
-object Test extends Application{
+object Test extends App{
   val x = (1 : Byte) match {
     case 2 => println(2);
     case 1 => println(1);
diff --git a/test/files/run/matchemptyarray.scala b/test/files/run/matchemptyarray.scala
index a7147f29f..1fa53b482 100644
--- a/test/files/run/matchemptyarray.scala
+++ b/test/files/run/matchemptyarray.scala
@@ -1,4 +1,4 @@
-object Test extends Application{
+object Test extends App{
   Array[String]() match {
     case x@Array() => println(x.deep.toString());
   }
diff --git a/test/files/run/matchintasany.scala b/test/files/run/matchintasany.scala
index e21dce956..c6764b31b 100644
--- a/test/files/run/matchintasany.scala
+++ b/test/files/run/matchintasany.scala
@@ -1,4 +1,4 @@
-object Test extends Application{
+object Test extends App{
   val x = (1 : Any) match {
     case 0xFFFFFFFF00000001L => println("Oops, overflow!");
     case 2L => println(2);
diff --git a/test/files/run/matchonstream.scala b/test/files/run/matchonstream.scala
index d38d81d9f..c9bfefc21 100644
--- a/test/files/run/matchonstream.scala
+++ b/test/files/run/matchonstream.scala
@@ -1,3 +1,3 @@
-object Test extends Application{
+object Test extends App{
   Stream.from(1) match { case Stream(1, 2, x @_*) => println("It worked!") }
 }
diff --git a/test/files/run/missingparams.scala b/test/files/run/missingparams.scala
index 0b79fa15d..e9b1d27d6 100644
--- a/test/files/run/missingparams.scala
+++ b/test/files/run/missingparams.scala
@@ -13,7 +13,7 @@ final class Foo(val x: Int) {
     }
 }
 
-object Test extends Application {
+object Test extends App {
   val foo1 = new Foo(42)
   val foo2 = new Foo(-42)
 
diff --git a/test/files/run/multi-array.scala b/test/files/run/multi-array.scala
index 42f64751f..4f3a8d305 100644
--- a/test/files/run/multi-array.scala
+++ b/test/files/run/multi-array.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val a = Array(1, 2, 3)
   println(a.deepToString)
 
diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala
index 63f7950d6..2d1d7417e 100644
--- a/test/files/run/names-defaults.scala
+++ b/test/files/run/names-defaults.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def get[T](x: T) = { println("get: "+ x); x }
 
   // TESTS
diff --git a/test/files/run/packrat1.scala b/test/files/run/packrat1.scala
index 71b593d42..47e77da26 100644
--- a/test/files/run/packrat1.scala
+++ b/test/files/run/packrat1.scala
@@ -6,7 +6,7 @@ import scala.util.parsing.syntax._
 
 import scala.collection.mutable.HashMap
 
-object Test extends Application{
+object Test extends App{
   import grammars._
 
   val head = phrase(term)
diff --git a/test/files/run/packrat2.scala b/test/files/run/packrat2.scala
index 45558e86c..1ea828529 100644
--- a/test/files/run/packrat2.scala
+++ b/test/files/run/packrat2.scala
@@ -6,7 +6,7 @@ import scala.util.parsing.syntax._
 
 import scala.collection.mutable.HashMap
 
-object Test extends Application{
+object Test extends App{
   import grammars2._
 
   val head = phrase(exp)
diff --git a/test/files/run/preinits.scala b/test/files/run/preinits.scala
index 8de43b62e..6566c4086 100644
--- a/test/files/run/preinits.scala
+++ b/test/files/run/preinits.scala
@@ -1,6 +1,6 @@
 trait A { val x: Int; println("A") }
 trait B extends { override val x = 1 } with A { println("B") }
 trait C extends { override val x = 2 } with A
-object Test extends B with C with Application {
+object Test extends B with C with App {
   println(x)
 }
diff --git a/test/files/run/proxy.scala b/test/files/run/proxy.scala
index 869cbf87d..5f4039794 100644
--- a/test/files/run/proxy.scala
+++ b/test/files/run/proxy.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val p = new Proxy {
     def self = 2 
   }
diff --git a/test/files/run/randomAccessSeq-apply.scala b/test/files/run/randomAccessSeq-apply.scala
index f398ea153..b8d6d5405 100644
--- a/test/files/run/randomAccessSeq-apply.scala
+++ b/test/files/run/randomAccessSeq-apply.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val empty = RandomAccessSeq()
   assert(empty.isEmpty)
   
diff --git a/test/files/run/runtime-richChar.scala b/test/files/run/runtime-richChar.scala
index f5ddc95f0..cf18a1d30 100644
--- a/test/files/run/runtime-richChar.scala
+++ b/test/files/run/runtime-richChar.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def testSeq(name: String, expected: Seq[Char], got: Seq[Char]) {
     if (expected.toList == got.toList)
       println(name + " ok")
diff --git a/test/files/run/slices.scala b/test/files/run/slices.scala
index 9c76572bf..e31ea4046 100644
--- a/test/files/run/slices.scala
+++ b/test/files/run/slices.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   // lists
   println(List(1, 2, 3, 4).slice(1, 2))
diff --git a/test/files/run/sort.scala b/test/files/run/sort.scala
index 899fea551..b89ff22f5 100644
--- a/test/files/run/sort.scala
+++ b/test/files/run/sort.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   println((1 to 100000).toList.sort(_<_).length)
   println(List(1, 5, 10, 3, 2).toList.sort(_<_))
   println(List(1, 5, 10, 3, 2).toList.sort(_>_))
diff --git a/test/files/run/stream_flatmap_odds.scala b/test/files/run/stream_flatmap_odds.scala
index ed1a537bd..6fb202ca6 100644
--- a/test/files/run/stream_flatmap_odds.scala
+++ b/test/files/run/stream_flatmap_odds.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 	lazy val odds: Stream[Int] = Stream(1) append ( odds flatMap {x => Stream(x + 2)} )
 	println(odds take 42 force)
-}
\ No newline at end of file
+}
diff --git a/test/files/run/streams.scala b/test/files/run/streams.scala
index e3c871c69..51b4e5d76 100644
--- a/test/files/run/streams.scala
+++ b/test/files/run/streams.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val s0: Stream[Int] = Stream.empty
   println(s0.take(1))
   println(s0.takeWhile(_ > 0))
diff --git a/test/files/run/stringbuilder.scala b/test/files/run/stringbuilder.scala
index 8ee8435e3..ef85fc02a 100644
--- a/test/files/run/stringbuilder.scala
+++ b/test/files/run/stringbuilder.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val str = "ABCDEFGHIJKLMABCDEFGHIJKLM"
   val surrogateStr = "an old Turkic letter: \uD803\uDC22"
   
diff --git a/test/files/run/structural.scala b/test/files/run/structural.scala
index c9a13b846..36af8c4bf 100644
--- a/test/files/run/structural.scala
+++ b/test/files/run/structural.scala
@@ -193,7 +193,7 @@ object test4 {
   
 }
 
-object Test extends Application {
+object Test extends App {
   test1
   test2
   test3
diff --git a/test/files/run/t0017.scala b/test/files/run/t0017.scala
index 5f02606b7..103a08901 100644
--- a/test/files/run/t0017.scala
+++ b/test/files/run/t0017.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
 def transpose[A](arr: Array[Array[A]]) = {
   for (i <- Array.range(0, arr(0).length)) yield
diff --git a/test/files/run/t0042.scala b/test/files/run/t0042.scala
index 53314f288..aa4a74d2f 100644
--- a/test/files/run/t0042.scala
+++ b/test/files/run/t0042.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def getClause[T](clauses: List[T]): Option[T] = {
     for (c <- clauses) {
       return Some(c)
diff --git a/test/files/run/t0412.scala b/test/files/run/t0412.scala
index f1ca7379a..873fbb1eb 100644
--- a/test/files/run/t0412.scala
+++ b/test/files/run/t0412.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   println(classOf[java.util.ArrayList[_]])
   println(classOf[java.util.ArrayList[T] forSome { type T }])
 }
diff --git a/test/files/run/t0421.scala b/test/files/run/t0421.scala
index 121fc4f2f..128bd1bdb 100644
--- a/test/files/run/t0421.scala
+++ b/test/files/run/t0421.scala
@@ -1,5 +1,5 @@
 // ticket #421
-object Test extends Application {
+object Test extends App {
 
   def transpose[A: ClassManifest](xss: Array[Array[A]]) = {
     for (i <- Array.range(0, xss(0).length)) yield
diff --git a/test/files/run/t0486.scala b/test/files/run/t0486.scala
index 9cedecc09..d3ed8f422 100644
--- a/test/files/run/t0486.scala
+++ b/test/files/run/t0486.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   import scala.xml._
 
   def wsdlTemplate1(serviceName: String): Node =
diff --git a/test/files/run/t0508.scala b/test/files/run/t0508.scala
index 8dc34dd41..0f4325e62 100644
--- a/test/files/run/t0508.scala
+++ b/test/files/run/t0508.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   case class Foo(s: String, n: Int)
 
diff --git a/test/files/run/t0528.scala b/test/files/run/t0528.scala
index df6d13a17..a76f602ed 100644
--- a/test/files/run/t0528.scala
+++ b/test/files/run/t0528.scala
@@ -7,7 +7,7 @@ class RichStr extends Sequ[Char] {
   def toArray: Array[Char] = Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9')
 }
 
-object Test extends Application {
+object Test extends App {
   val x: RichStr = new RichStr
 
   println((x: Sequ[Char]).toArray.deep) // calling through the bridge misses unboxing
diff --git a/test/files/run/t0607.scala b/test/files/run/t0607.scala
index 5601494de..b07fdcd49 100644
--- a/test/files/run/t0607.scala
+++ b/test/files/run/t0607.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   case class A()
   class B extends A() { override def toString() = "B()" }
   println(A())
diff --git a/test/files/run/t0631.scala b/test/files/run/t0631.scala
index 48bb3c986..5bceab619 100644
--- a/test/files/run/t0631.scala
+++ b/test/files/run/t0631.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   class Foo { 
     override def equals(that: Any) = {
       println("Foo.equals called")
diff --git a/test/files/run/t0663.scala b/test/files/run/t0663.scala
index 16a5a4833..dd0326d4e 100644
--- a/test/files/run/t0663.scala
+++ b/test/files/run/t0663.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val src = scala.io.Source.fromString("")
   val parser = xml.parsing.ConstructingParser.fromSource(src, true)
   println(parser.document)
diff --git a/test/files/run/t0668.scala b/test/files/run/t0668.scala
index 2f1eaba0d..98ecb554c 100644
--- a/test/files/run/t0668.scala
+++ b/test/files/run/t0668.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val ints: Array[Int] = Array(1, 2, 3)
   ints.toArray
 }
diff --git a/test/files/run/t0677.scala b/test/files/run/t0677.scala
index 94f30815b..764f8e82c 100644
--- a/test/files/run/t0677.scala
+++ b/test/files/run/t0677.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   class X[T: ClassManifest] { 
     val a = new Array[Array[T]](3,4)
     val b = Array.ofDim[T](3, 4) 
diff --git a/test/files/run/t0807.scala b/test/files/run/t0807.scala
index b4aa0b14a..1a1add6b3 100644
--- a/test/files/run/t0807.scala
+++ b/test/files/run/t0807.scala
@@ -1,5 +1,5 @@
 trait A
 trait B extends A { val x = println("early") } 
-object Test extends Application {
+object Test extends App {
   new B {}
 }
diff --git a/test/files/run/t0883.scala b/test/files/run/t0883.scala
index 4bbd9bfe4..adde95197 100644
--- a/test/files/run/t0883.scala
+++ b/test/files/run/t0883.scala
@@ -2,7 +2,7 @@ object Foo { def apply(x: String) = new Foo(x) }
 class Foo(name: String)
 case object Bar extends Foo("Bar")
 case class Baz() extends Foo("Baz") 
-object Test extends Application {
+object Test extends App {
   Foo("Bar") match { 
     case Bar => println("What?") 
     case _ => println("OK")
diff --git a/test/files/run/t0911.scala b/test/files/run/t0911.scala
index 6f9ad9178..be8c5de1d 100644
--- a/test/files/run/t0911.scala
+++ b/test/files/run/t0911.scala
@@ -4,6 +4,6 @@ class IP extends {
   val baz = "bar";
 } with Foo(() => baz);
 
-object Test extends Application{
+object Test extends App{
   (new IP).bar();
 }
diff --git a/test/files/run/t0936.scala b/test/files/run/t0936.scala
index 3a7535a5d..e3470a248 100644
--- a/test/files/run/t0936.scala
+++ b/test/files/run/t0936.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def foo = {
 
     abstract class MouseEventType { def x: String }
diff --git a/test/files/run/t1167.scala b/test/files/run/t1167.scala
index c097cd640..c2ec4cff4 100644
--- a/test/files/run/t1167.scala
+++ b/test/files/run/t1167.scala
@@ -23,7 +23,7 @@ abstract class Foo {
   } 
 }
 
-object Test extends Application {
+object Test extends App {
   val foo = new Foo {}
   val bar = new foo.Bar {}
   println(foo)
diff --git a/test/files/run/t1323.scala b/test/files/run/t1323.scala
index 831f8c72f..8209b8521 100644
--- a/test/files/run/t1323.scala
+++ b/test/files/run/t1323.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   println(" 1:" + List(1,2,3,4).indexOfSlice(List(0,1)))        // -1
   println(" 2:" + List(1,2,3,4).indexOfSlice(List(1,2)))        //  0
   println(" 3:" + List(1,2,3,4).indexOfSlice(List(2,3)))        //  1
diff --git a/test/files/run/t1368.scala b/test/files/run/t1368.scala
index c9b229720..04e9195d3 100644
--- a/test/files/run/t1368.scala
+++ b/test/files/run/t1368.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   trait Happy { val status = "happy" }
   trait Sad { val status = "sad" }
 
diff --git a/test/files/run/t1423.scala b/test/files/run/t1423.scala
index 4f2c91153..44c665328 100644
--- a/test/files/run/t1423.scala
+++ b/test/files/run/t1423.scala
@@ -1,4 +1,4 @@
-object Test extends Application{
+object Test extends App{
   val x = 1 match {
     case 0xFFFFFFFF00000001L => println("Oops, overflow!");
     case 2L => println(2);
diff --git a/test/files/run/t1505.scala b/test/files/run/t1505.scala
index fdcd4f3fb..a246e8a35 100644
--- a/test/files/run/t1505.scala
+++ b/test/files/run/t1505.scala
@@ -10,7 +10,7 @@ object R extends Enumeration {
   val A, B, C = Value
 }
 
-object Test extends Application {
+object Test extends App {
   assert(P(0) == P.withName("A"))
   assert(P.C == P.withName("C"))
 
diff --git a/test/files/run/t1524.scala b/test/files/run/t1524.scala
index 3b06afdbf..8a1fb7d5c 100644
--- a/test/files/run/t1524.scala
+++ b/test/files/run/t1524.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   val buf = new scala.collection.mutable.ArrayBuffer[String](0)
   buf += "initial"
diff --git a/test/files/run/t153.scala b/test/files/run/t153.scala
index 359e40407..82492fdbe 100644
--- a/test/files/run/t153.scala
+++ b/test/files/run/t153.scala
@@ -1,5 +1,5 @@
-object Test extends Application {
+object Test extends App {
 	def powers(x: Int) = if ((x&(x-1))==0) Some(x) else None
 	val res = (Stream.range(1, 500000) flatMap powers).reverse
 	println(res take 42 force)
-}
\ No newline at end of file
+}
diff --git a/test/files/run/t1535.scala b/test/files/run/t1535.scala
index d0ae4814f..b0163a971 100644
--- a/test/files/run/t1535.scala
+++ b/test/files/run/t1535.scala
@@ -8,7 +8,7 @@ class ClassDecl extends BlockStmt {
     lazy val y = true
 }
 
-object Test extends Application {
+object Test extends App {
     val n = new ClassDecl ()
     println (n.x)
     println (n.y)
diff --git a/test/files/run/t1537.scala b/test/files/run/t1537.scala
index 885114204..ddbfb29ac 100644
--- a/test/files/run/t1537.scala
+++ b/test/files/run/t1537.scala
@@ -8,7 +8,7 @@ trait Evaluation {
   def equalInTrait = this.syntax.Foo == this.syntax.Foo
 }
 
-object Test extends Evaluation with Application {
+object Test extends Evaluation with App {
   object syntax extends Syntax 
 
   def equalInObject = this.syntax.Foo == this.syntax.Foo
diff --git a/test/files/run/t1591.scala b/test/files/run/t1591.scala
index 28e77775f..bd43f0b23 100644
--- a/test/files/run/t1591.scala
+++ b/test/files/run/t1591.scala
@@ -8,7 +8,7 @@ abstract class A {
 
 }
 
-object Test extends Application {
+object Test extends App {
     val a = new A{}
     println(a.lazyBar.foo)
 }
diff --git a/test/files/run/t1618.scala b/test/files/run/t1618.scala
index 9f3ade611..91f6de587 100644
--- a/test/files/run/t1618.scala
+++ b/test/files/run/t1618.scala
@@ -1,5 +1,5 @@
 
-object Test extends Application {
+object Test extends App {
   import scala.tools.nsc.io._
 
   val dir: VirtualDirectory = new VirtualDirectory("foo", None)
diff --git a/test/files/run/t1620.scala b/test/files/run/t1620.scala
index ff25955eb..e8ea06eb5 100644
--- a/test/files/run/t1620.scala
+++ b/test/files/run/t1620.scala
@@ -2,7 +2,7 @@ import java.io.PrintWriter
 import scala.xml.XML
 import scala.xml.dtd.{DocType, PublicID}
 
-object Test extends Application {
+object Test extends App {
   val dt = DocType("foo", PublicID("-//Foo Corp//DTD 1.0//EN", "foo.dtd"), Seq())
   val pw = new PrintWriter(System.out)
   XML.write(pw, , "utf-8", true, dt)
diff --git a/test/files/run/t1718.scala b/test/files/run/t1718.scala
index 431e23732..358bd1be5 100644
--- a/test/files/run/t1718.scala
+++ b/test/files/run/t1718.scala
@@ -1,4 +1,4 @@
-object Test extends Application{
+object Test extends App{
   def matchesNull[T](mightBeNull: Array[T]): Boolean = mightBeNull match { 
     case null => true
     case x => false
diff --git a/test/files/run/t1747.scala b/test/files/run/t1747.scala
index f7f54ee7d..b11af6c02 100644
--- a/test/files/run/t1747.scala
+++ b/test/files/run/t1747.scala
@@ -3,4 +3,4 @@ object Foo extends Foo {
 }
 class Foo
 
-object Test extends Application { Foo }
+object Test extends App { Foo }
diff --git a/test/files/run/t1773.scala b/test/files/run/t1773.scala
index 04729df7e..c50b62512 100644
--- a/test/files/run/t1773.scala
+++ b/test/files/run/t1773.scala
@@ -1,4 +1,4 @@
-object Test extends Application
+object Test extends App
 {
   val xs = List(
     ,
diff --git a/test/files/run/t1939.scala b/test/files/run/t1939.scala
index 7d6261906..7626e8bc1 100644
--- a/test/files/run/t1939.scala
+++ b/test/files/run/t1939.scala
@@ -15,7 +15,7 @@ final class T2(_module: Module) extends T {
   def module = _module
 }
 
-object Test extends Application {
+object Test extends App {
 
   type mType = Module
 
diff --git a/test/files/run/t2030.scala b/test/files/run/t2030.scala
index 251ae2c62..2333c3981 100644
--- a/test/files/run/t2030.scala
+++ b/test/files/run/t2030.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable._
 
-object Test extends Application {
+object Test extends App {
   val res0 = TreeSet(1, 2, 3, 4, 5, 6)
   val res1 = res0.map(x => x)
   println(res0.toList == res1.toList)
diff --git a/test/files/run/t2111.scala b/test/files/run/t2111.scala
index 3c6c5b8e8..98177c4e2 100644
--- a/test/files/run/t2111.scala
+++ b/test/files/run/t2111.scala
@@ -1,5 +1,5 @@
 
-object Test extends Application {
+object Test extends App {
 
   object Color extends Enumeration {
     val Red, Green, Blue = Value
diff --git a/test/files/run/t2147.scala b/test/files/run/t2147.scala
index 185e617d8..1a1dfddc7 100644
--- a/test/files/run/t2147.scala
+++ b/test/files/run/t2147.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val s: Seq[Int] = Stream.from(1)
   val res0 = s.map(a => 2).head
   val res1 = Stream.from(1).flatMap(a => List(1)).head
diff --git a/test/files/run/t2176.scala b/test/files/run/t2176.scala
index f8b07271a..2a46dcf2c 100644
--- a/test/files/run/t2176.scala
+++ b/test/files/run/t2176.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val res0 = Stream.cons(1, Stream.cons( { println("ouch"); 2 }, Stream.empty))
   println(res0.take(1).force)
 }
diff --git a/test/files/run/t2177.scala b/test/files/run/t2177.scala
index fd1a29d19..5e344c654 100644
--- a/test/files/run/t2177.scala
+++ b/test/files/run/t2177.scala
@@ -1,3 +1,3 @@
-object Test extends Application {
+object Test extends App {
   println(Stream.from(1).take(5).mkString)
 }
diff --git a/test/files/run/t2236.scala b/test/files/run/t2236.scala
index 8e2b3900d..64ed18c80 100755
--- a/test/files/run/t2236.scala
+++ b/test/files/run/t2236.scala
@@ -1,7 +1,7 @@
 class T[A](implicit val m:Manifest[A])
 class Foo
 class Bar extends T[Foo]
-object Test extends Application {
+object Test extends App {
   new Bar
 }
 
diff --git a/test/files/run/t2255.scala b/test/files/run/t2255.scala
index be800adf5..0b34115ed 100644
--- a/test/files/run/t2255.scala
+++ b/test/files/run/t2255.scala
@@ -1,3 +1,3 @@
-object Test extends Application {
+object Test extends App {
   println(Stream.continually(Stream(1, 2, 3)).flatten.take(6).toList)
 }
diff --git a/test/files/run/t2503.scala b/test/files/run/t2503.scala
index 353a1dcac..21801e2db 100755
--- a/test/files/run/t2503.scala
+++ b/test/files/run/t2503.scala
@@ -13,7 +13,7 @@ trait SB[A] extends Buffer[A] {
   }
 }
 
-object Test extends Application {
+object Test extends App {
   new ArrayBuffer[Int] with SB[Int]
 }
 
diff --git a/test/files/run/t2788.scala b/test/files/run/t2788.scala
index 7cc5031a5..b1596d582 100644
--- a/test/files/run/t2788.scala
+++ b/test/files/run/t2788.scala
@@ -1,3 +1,3 @@
-object Test extends Application {
+object Test extends App {
   println(Array(Some(1), None, Some(2)).flatten.toList)
-}
\ No newline at end of file
+}
diff --git a/test/files/run/t2813.2.scala b/test/files/run/t2813.2.scala
index 4225da295..e55cc6c00 100644
--- a/test/files/run/t2813.2.scala
+++ b/test/files/run/t2813.2.scala
@@ -1,7 +1,7 @@
 import java.util.LinkedList
 import collection.JavaConversions._
 
-object Test extends Application {
+object Test extends App {
   def assertListEquals[A](expected: List[A], actual: Seq[A]) {
     assert(expected.sameElements(actual),
            "Expected list to contain " + expected.mkString("[", ", ", "]") +
diff --git a/test/files/run/t2857.scala b/test/files/run/t2857.scala
index bd0d6fde1..c523227c4 100644
--- a/test/files/run/t2857.scala
+++ b/test/files/run/t2857.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   import collection.mutable._
   val m = new HashMap[Int, Set[String]] with MultiMap[Int, String]
   m.addBinding(6, "Foo")
diff --git a/test/files/run/t3038.scala b/test/files/run/t3038.scala
index cc502ee73..986fc982e 100644
--- a/test/files/run/t3038.scala
+++ b/test/files/run/t3038.scala
@@ -62,7 +62,7 @@ class C extends A {
   }
 }
 
-object Test extends Application {
+object Test extends App {
   (new C).run
 }
 
diff --git a/test/files/run/t3038b.scala b/test/files/run/t3038b.scala
index 0b9731f52..1527d64eb 100644
--- a/test/files/run/t3038b.scala
+++ b/test/files/run/t3038b.scala
@@ -15,6 +15,6 @@ class A {
     }
 }
 
-object Test extends Application {
+object Test extends App {
     new A().run
 }
diff --git a/test/files/run/t3186.scala b/test/files/run/t3186.scala
index 2534d4a16..09de1a5ce 100644
--- a/test/files/run/t3186.scala
+++ b/test/files/run/t3186.scala
@@ -2,6 +2,6 @@ object Dist1 extends Enumeration { val Mile, Foot, Inch = Value }
 
 object Dist2 extends Enumeration { val Kilometer, Millimeter, Parsec = Value }
 
-object Test extends Application {
+object Test extends App {
   println(Dist1.Mile == Dist2.Kilometer)
 }
diff --git a/test/files/run/t3361.scala b/test/files/run/t3361.scala
index 3e6fc30c8..17af89a67 100644
--- a/test/files/run/t3361.scala
+++ b/test/files/run/t3361.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   import scala.collection.mutable.DoubleLinkedList
 
   empty
diff --git a/test/files/run/t3619.scala b/test/files/run/t3619.scala
index 10b9f9468..46324b4d6 100644
--- a/test/files/run/t3619.scala
+++ b/test/files/run/t3619.scala
@@ -1,6 +1,6 @@
 class Dep(x: Int)(implicit val nameClash: String)
 
-object Test extends Application {
+object Test extends App {
   implicit val nameClash: String = "meh"
 
   def meth(implicit w: String) = 1
@@ -31,4 +31,4 @@ object Test extends Application {
       this(Meh.this.nameClash, 1)
     }
   }
-*/
\ No newline at end of file
+*/
diff --git a/test/files/run/t3670.scala b/test/files/run/t3670.scala
index a37c3a242..97f1e8a79 100644
--- a/test/files/run/t3670.scala
+++ b/test/files/run/t3670.scala
@@ -11,7 +11,7 @@ class C {
   }
 }
 
-class M extends Application {
+class M extends App {
   def foo {
     lazy val a = {
         lazy val b = 1
@@ -25,7 +25,7 @@ class M extends Application {
   }
 }
 
-object Test extends Application {
+object Test extends App {
     new C()
     new M().foo
-}
\ No newline at end of file
+}
diff --git a/test/files/run/t3687.scala b/test/files/run/t3687.scala
index 25141f8a3..e26433bec 100644
--- a/test/files/run/t3687.scala
+++ b/test/files/run/t3687.scala
@@ -1,6 +1,6 @@
 object t extends Enumeration { val a, b = Value }
 
-object Test extends Application {
+object Test extends App {
   println(t.values)
   println(t.values)
 }
diff --git a/test/files/run/t3719.scala b/test/files/run/t3719.scala
index 0dd3fc2af..4649f11bb 100644
--- a/test/files/run/t3719.scala
+++ b/test/files/run/t3719.scala
@@ -12,7 +12,7 @@ object Days extends Enumeration {
   }
 }
 
-object Test extends Application {
+object Test extends App {
   def dayElementsShouldBeNamed(): List[String] =
     Days.values.toList.sorted.map(x => x.toString)
 
diff --git a/test/files/run/t3726.scala b/test/files/run/t3726.scala
index 5ceed5416..02b262fda 100644
--- a/test/files/run/t3726.scala
+++ b/test/files/run/t3726.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   def test(f: () => Int) = {
     val x = f()
     5
diff --git a/test/files/run/t3763.scala b/test/files/run/t3763.scala
index c8462b743..1ac3013c8 100644
--- a/test/files/run/t3763.scala
+++ b/test/files/run/t3763.scala
@@ -1,3 +1,3 @@
-object Test extends Application {
+object Test extends App {
   val x = Array(Array(1), List(1))
 }
diff --git a/test/files/run/t3835.scala b/test/files/run/t3835.scala
index 1f0e35a89..49e591195 100644
--- a/test/files/run/t3835.scala
+++ b/test/files/run/t3835.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   println((1, 2, 3) match { case (r, \u03b8, \u03c6) => r + \u03b8 + \u03c6 })
   println(1 match { case \u00e9 => \u00e9 })
 }
diff --git a/test/files/run/t3857.scala b/test/files/run/t3857.scala
index 9cb44e7fe..53afb33ba 100644
--- a/test/files/run/t3857.scala
+++ b/test/files/run/t3857.scala
@@ -3,10 +3,10 @@ class ScalaGeneric { var s: java.util.Set[String] = _ }
 trait ScalaGeneric2Trait { var s: java.util.Set[String] = _ }
 class ScalaGeneric2 extends ScalaGeneric2Trait
 
-object Test extends Application {
+object Test extends App {
   println(classOf[ScalaGeneric].getDeclaredField("s").toGenericString)
   // java.util.Set ScalaGeneric.s
 
   println(classOf[ScalaGeneric2].getDeclaredField("s").toGenericString)
   // java.util.Set ScalaGeneric2.s -- should be same as above
-}
\ No newline at end of file
+}
diff --git a/test/files/run/t3950.scala b/test/files/run/t3950.scala
index fe99a7cc6..58466e13f 100644
--- a/test/files/run/t3950.scala
+++ b/test/files/run/t3950.scala
@@ -10,7 +10,7 @@ object NegativeId extends Enumeration {
   }
 }
 
-object Test extends Application {
+object Test extends App {
   println(NegativeId.fromInt(-1))
   println(NegativeId.fromInt(0))
   println(NegativeId.fromInt(1))
diff --git a/test/files/run/t4024.scala b/test/files/run/t4024.scala
index a25c3ebc0..ef768beb9 100644
--- a/test/files/run/t4024.scala
+++ b/test/files/run/t4024.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
 
   val x = "abc" 
 
diff --git a/test/files/run/t4146.scala b/test/files/run/t4146.scala
index 6c960fa3f..a17de50ee 100644
--- a/test/files/run/t4146.scala
+++ b/test/files/run/t4146.scala
@@ -1,7 +1,7 @@
-object bob extends Application {
+object bob extends App {
   var name = "Bob"
 }
 
-object Test extends Application {
+object Test extends App {
   assert(bob.name == "Bob")
 }
diff --git a/test/files/run/t498.scala b/test/files/run/t498.scala
index 50be317c4..b4ede951f 100644
--- a/test/files/run/t498.scala
+++ b/test/files/run/t498.scala
@@ -1,5 +1,5 @@
-object Test extends Application {
+object Test extends App {
 // the function passed to flatMap produces lots of empty streams, but this should not overflow the stack
 	val res = Stream.from(1).flatMap(i => if (i < 3000) Stream.empty else List(1))
 	println(res take 42 force)
-}
\ No newline at end of file
+}
diff --git a/test/files/run/tailcalls.scala b/test/files/run/tailcalls.scala
index 33382405e..8830e7c9a 100644
--- a/test/files/run/tailcalls.scala
+++ b/test/files/run/tailcalls.scala
@@ -193,7 +193,7 @@ object FancyTailCalls {
   val f2 = new FancyTailCalls
 }
 
-object PolyObject extends Application {
+object PolyObject extends App {
   def tramp[A](x: Int): Int = 
     if (x > 0)
       tramp[A](x - 1)
diff --git a/test/files/run/tcpoly_monads.scala b/test/files/run/tcpoly_monads.scala
index a549caa51..cffbcc963 100644
--- a/test/files/run/tcpoly_monads.scala
+++ b/test/files/run/tcpoly_monads.scala
@@ -37,6 +37,6 @@ trait OptionMonad extends Monads {
       }
 }
 
-object Test extends OptionMonad with Application {
+object Test extends OptionMonad with App {
   Console.println((Some("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") >>= (x => Some(x.length))).get)
 }
diff --git a/test/files/run/tcpoly_overriding.scala b/test/files/run/tcpoly_overriding.scala
index 00ab58057..86ba89f53 100644
--- a/test/files/run/tcpoly_overriding.scala
+++ b/test/files/run/tcpoly_overriding.scala
@@ -11,6 +11,6 @@ class B extends A[List] {
   def b: List[Int] = List(1)
 }
 
-object Test extends Application {
+object Test extends App {
   Console.println((new B).b(0))
 }
diff --git a/test/files/run/tcpoly_parseridioms.scala b/test/files/run/tcpoly_parseridioms.scala
index 2747e1bc8..634240e44 100644
--- a/test/files/run/tcpoly_parseridioms.scala
+++ b/test/files/run/tcpoly_parseridioms.scala
@@ -104,6 +104,6 @@ trait ParserIdioms extends Parsers with Idioms {
   implicit def curry3[r,s,t,u](fun: (r,s, t)=>u)(a: r)(b: s)(c: t) = fun(a, b, c)  
 }
 
-object Test extends ParserIdioms with Application {
+object Test extends ParserIdioms with App {
   println(expr("12".toList))
 }
diff --git a/test/files/run/try.scala b/test/files/run/try.scala
index 7e615ec1a..ad3d60624 100644
--- a/test/files/run/try.scala
+++ b/test/files/run/try.scala
@@ -1,4 +1,4 @@
-object Test extends AnyRef with Application {
+object Test extends AnyRef with App {
   val x = 1;
 
   def try1 = {
diff --git a/test/files/run/tuples.scala b/test/files/run/tuples.scala
index b32c856af..4854e36c9 100644
--- a/test/files/run/tuples.scala
+++ b/test/files/run/tuples.scala
@@ -1,6 +1,6 @@
 import Function._
 
-object Test extends Application {
+object Test extends App {
   var xyz: (Int, String, Boolean) = _
   xyz = (1, "abc", true)
   Console.println(xyz)
diff --git a/test/files/run/typealias_overriding.scala b/test/files/run/typealias_overriding.scala
index a102b66b7..8a2d1312a 100644
--- a/test/files/run/typealias_overriding.scala
+++ b/test/files/run/typealias_overriding.scala
@@ -1,7 +1,7 @@
 // this bug (http://scala-webapps.epfl.ch/bugtracking/bugs/displayItem.do?id=1065)
 // was caused by Uncurry not normalizing all the types 
 // (more specifically the argument/return types of an anonymous Function)
-object Test extends Application {
+object Test extends App {
   trait AddRemove {
     type TNode <: NodeImpl;
     trait NodeImpl;
diff --git a/test/files/run/unboxingBug.scala b/test/files/run/unboxingBug.scala
index 62c2d2020..5f129b64b 100644
--- a/test/files/run/unboxingBug.scala
+++ b/test/files/run/unboxingBug.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   println(identity('a').toInt)
   println('a'.toInt)
   println(identity('a').asInstanceOf[Int])
diff --git a/test/files/run/viewtest.scala b/test/files/run/viewtest.scala
index c5dffa5db..bbe5a1256 100755
--- a/test/files/run/viewtest.scala
+++ b/test/files/run/viewtest.scala
@@ -1,5 +1,5 @@
 import collection._
-object Test extends Application {
+object Test extends App {
 
   val xs: SeqView[(String, Int), Seq[_]] = List("x").view.zip(Stream.from(0))
   println(xs)
diff --git a/test/files/run/weakconform.scala b/test/files/run/weakconform.scala
index 1ea81c9f6..30a12b929 100755
--- a/test/files/run/weakconform.scala
+++ b/test/files/run/weakconform.scala
@@ -1,4 +1,4 @@
-object Test extends Application {
+object Test extends App {
   val x: Float = 10/3
   assert(x == 3.0)
 }
diff --git a/test/files/shootout/hello.scala b/test/files/shootout/hello.scala
index f7451aa82..65aec8989 100644
--- a/test/files/shootout/hello.scala
+++ b/test/files/shootout/hello.scala
@@ -4,7 +4,7 @@
    modified for Scala 2.x by Anthony Borla
 */
 
-object hello extends Application {
+object hello extends App {
   Console.println("hello world")
 }
 
diff --git a/test/files/specialized/spec-early.scala b/test/files/specialized/spec-early.scala
index 065dd57db..65687b862 100644
--- a/test/files/specialized/spec-early.scala
+++ b/test/files/specialized/spec-early.scala
@@ -9,7 +9,7 @@ class Foo[@specialized(Int) T](_x: T) extends {
   println(bar)
 }
 
-object Test extends Application {
+object Test extends App {
   new Foo("a")
   new Foo(42)
   println(runtime.BoxesRunTime.integerBoxCount)
diff --git a/test/files/specialized/spec-overrides.scala b/test/files/specialized/spec-overrides.scala
index 1e0331a31..90dd5a4e7 100644
--- a/test/files/specialized/spec-overrides.scala
+++ b/test/files/specialized/spec-overrides.scala
@@ -11,7 +11,7 @@
  }
 
 
-object Test extends Application {
+object Test extends App {
   val d2 = new D2
 
   assert(d2.default == 1.0, d2.default)