Skip to content

Commit ba466e9

Browse files
committed
Rename main objects in tests to _main
This was done just because compiling with a non-empty classpaths leads to conflicts when main is used as an annotation.
1 parent 1e13a92 commit ba466e9

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

tests/fuzzy/b82054893e0db44e31ae82d696c19c1fbc7be55c.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
object main {
1+
object _main {
22
def i0 = {
33
class i1 {
44
private[i0] var i2: _ > 0 private def i3: List[Int]

tests/pos/localmodules.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test;
22

3-
object main {
3+
object _main {
44

55
class a {
66

tests/pos/t0002.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
object main {
1+
object _main {
22
def main(args: Array[String]) = {
33
val b = true;
44
while (b == true) { }

tests/pos/t789.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
object main { // don't do this at home
1+
object _main { // don't do this at home
22

33
trait Impl
44

tests/pos/typealiases.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ trait Test[T] {
1111
def check2[S](xs: Array[S], c: Check[S]) = c(xs)
1212
}
1313

14-
object main extends Test[Int] {
14+
object _main extends Test[Int] {
1515
val pair1 = (1,1)
1616

1717
implicit def topair(x: Int): Tuple2[Int, Int] = (x,x)

0 commit comments

Comments
 (0)