Fix run-pass tests to have 'pub fn main'

This is required by the check-fast target because each test is slurped up into a
submodule.

Author: alexcrichton

src/etc/combine-tests.py

@@ -29,6 +29,8 @@ def scrub(b):
         if not ("xfail-test" in s or
                 "xfail-fast" in s or
                 "xfail-win32" in s):
+            if not "pub fn main" in s and "fn main" in s:
+                print("Warning: no public entry point in " + t)
             stage2_tests.append(t)
         f.close()
 

src/test/run-pass/attr-no-drop-flag-size.rs

@@ -20,6 +20,6 @@ impl<T> Drop for Test<T> {
     fn drop(&mut self) { }
 }
 
-fn main() {
+pub fn main() {
     assert_eq!(size_of::<int>(), size_of::<Test<int>>());
 }

src/test/run-pass/borrowck-macro-interaction-issue-6304.rs

@@ -26,4 +26,4 @@ impl Foo {
   fn check_id(&mut self, s: int) { fail!() }
 }
 
-fn main() { }
+pub fn main() { }

src/test/run-pass/borrowck-pat-enum.rs

@@ -43,5 +43,5 @@ fn match_mut_reg(v: &mut Option<int>) {
     }
 }
 
-fn main() {
+pub fn main() {
 }

src/test/run-pass/borrowck-static-item-in-fn.rs

@@ -10,6 +10,6 @@
 
 // Regression test for issue #7740
 
-fn main() {
+pub fn main() {
     static A: &'static char = &'A';
 }

src/test/run-pass/borrowck-unary-move-2.rs

@@ -26,7 +26,7 @@ fn noncopyable() -> noncopyable {
 
 struct wrapper(noncopyable);
 
-fn main() {
+pub fn main() {
     let x1 = wrapper(noncopyable());
     let _x2 = *x1;
 }

src/test/run-pass/borrowck-uniq-via-ref.rs

@@ -50,5 +50,5 @@ fn box_imm_recs(v: &Outer) {
     borrow(v.f.g.h); // OK
 }
 
-fn main() {
+pub fn main() {
 }

src/test/run-pass/borrowck-wg-autoderef-and-autoborrowvec-combined-issue-6272.rs

@@ -27,7 +27,7 @@
 // run-fail/borrowck-wg-autoderef-and-autoborrowvec-combined-fail-issue-6272.rs
 
 
-fn main() {
+pub fn main() {
     let a = @mut 3i;
     let b = @mut [a];
     let c = @mut [3];

src/test/run-pass/bug-7183-generics.rs

@@ -33,7 +33,7 @@ impl<T: Speak> Speak for Option<T> {
 }
 
 
-fn main() {
+pub fn main() {
     assert_eq!(3.hi(), ~"hello: 3");
     assert_eq!(Some(Some(3)).hi(), ~"something!something!hello: 3");
     assert_eq!(None::<int>.hi(), ~"hello - none");

src/test/run-pass/builtin-superkinds-capabilities-transitive.rs

@@ -26,7 +26,7 @@ fn foo<T: Foo>(val: T, chan: comm::Chan<T>) {
     chan.send(val);
 }
 
-fn main() {
+pub fn main() {
     let (p,c) = comm::stream();
     foo(31337, c);
     assert!(p.recv() == 31337);

src/test/run-pass/builtin-superkinds-capabilities.rs

@@ -22,7 +22,7 @@ fn foo<T: Foo>(val: T, chan: comm::Chan<T>) {
     chan.send(val);
 }
 
-fn main() {
+pub fn main() {
     let (p,c) = comm::stream();
     foo(31337, c);
     assert!(p.recv() == 31337);

src/test/run-pass/builtin-superkinds-phantom-typaram.rs

@@ -18,4 +18,4 @@ struct X<T>(());
 
 impl <T> Foo for X<T> { }
 
-fn main() { }
+pub fn main() { }

src/test/run-pass/builtin-superkinds-self-type.rs

@@ -21,7 +21,7 @@ trait Foo : Send {
 
 impl <T: Send> Foo for T { }
 
-fn main() {
+pub fn main() {
     let (p,c) = comm::stream();
     1193182.foo(c);
     assert!(p.recv() == 1193182);

src/test/run-pass/builtin-superkinds-simple.rs

@@ -14,4 +14,4 @@ trait Foo : Send { }
 
 impl Foo for int { }
 
-fn main() { }
+pub fn main() { }

src/test/run-pass/builtin-superkinds-typaram.rs

@@ -15,4 +15,4 @@ trait Foo : Send { }
 
 impl <T: Send> Foo for T { }
 
-fn main() { }
+pub fn main() { }

src/test/run-pass/cast-mutable-trait.rs

@@ -25,10 +25,10 @@ fn bar(t: @mut T) {
     t.foo();
 }
 
-fn main() {
+pub fn main() {
     let s = @mut S { unused: 0 };
     let s2 = s as @mut T;
     s2.foo();
     bar(s2);
     bar(s as @mut T);
-}
+}

src/test/run-pass/closure-bounds-can-capture-chan.rs

@@ -14,7 +14,7 @@ fn foo(blk: ~fn:Send()) {
     blk();
 }
 
-fn main() {
+pub fn main() {
     let (p,c) = comm::stream();
     do foo {
         c.send(());

src/test/run-pass/const-binops.rs

@@ -56,7 +56,7 @@ static am: bool = 2 > 1;
 static an: bool = 2 > -2;
 static ao: bool = 1.0 > -2.0;
 
-fn main() {
+pub fn main() {
     assert_eq!(a, -1);
     assert_eq!(a2, 6);
     assert_approx_eq!(b, 5.7);

src/test/run-pass/const-struct-offsets.rs

@@ -10,4 +10,4 @@ struct Bar {
 
 static bar: Bar = Bar { i: 0, v: IntVal(0) };
 
-fn main() {}
+pub fn main() {}

src/test/run-pass/default-method-parsing.rs

@@ -12,4 +12,4 @@ trait Foo {
     fn m(&self, _:int) { }
 }
 
-fn main() { }
+pub fn main() { }

src/test/run-pass/default-method-supertrait-vtable.rs

@@ -31,6 +31,6 @@ impl Y for int {
 
 impl Z for int;
 
-fn main() {
+pub fn main() {
     assert_eq!(12.x(), 12);
 }

src/test/run-pass/deriving-clone-generic-enum.rs

@@ -15,7 +15,7 @@ enum E<T,U> {
     C
 }
 
-fn main() {
+pub fn main() {
     let _ = A::<int, int>(1i).clone();
     let _ = B(1i, 1.234).deep_clone();
 }

src/test/run-pass/deriving-clone-generic-tuple-struct.rs

@@ -11,6 +11,6 @@
 #[deriving(Clone, DeepClone)]
 struct S<T>(T, ());
 
-fn main() {
+pub fn main() {
     let _ = S(1i, ()).clone().deep_clone();
 }

src/test/run-pass/deriving-clone-struct.rs

@@ -31,4 +31,4 @@ struct S {
     _nil: ()
 }
 
-fn main() {}
+pub fn main() {}

src/test/run-pass/deriving-cmp-shortcircuit.rs

@@ -35,7 +35,7 @@ struct ShortCircuit {
     y: FailCmp
 }
 
-fn main() {
+pub fn main() {
     let a = ShortCircuit { x: 1, y: FailCmp };
     let b = ShortCircuit { x: 2, y: FailCmp };
 

src/test/run-pass/deriving-self-lifetime.rs

@@ -13,7 +13,7 @@ struct A<'self> {
     x: &'self int
 }
 
-fn main() {
+pub fn main() {
     let a = A { x: &1 };
     let b = A { x: &2 };
 

src/test/run-pass/deriving-to-str.rs

@@ -34,7 +34,7 @@ impl ToStr for Custom {
     fn to_str(&self) -> ~str { ~"yay" }
 }
 
-fn main() {
+pub fn main() {
     assert_eq!(B1.to_str(), ~"B1");
     assert_eq!(B2.to_str(), ~"B2");
     assert_eq!(C1(3).to_str(), ~"C1(3)");

src/test/run-pass/deriving-zero.rs

@@ -33,7 +33,7 @@ struct Lots {
     j: (),
 }
 
-fn main() {
+pub fn main() {
     let lots: Lots = Zero::zero();
     assert!(lots.is_zero());
 }

src/test/run-pass/enum-discr.rs

@@ -12,7 +12,7 @@ enum Hero {
     Spiderman = -4
 }
 
-fn main() {
+pub fn main() {
     let pet: Animal = Snake;
     let hero: Hero = Superman;
     assert!(pet as uint == 3);

src/test/run-pass/enum-vec-initializer.rs

@@ -15,7 +15,7 @@ enum Flopsy {
 static BAR:uint = Bunny as uint;
 static BAR2:uint = BAR;
 
-fn main() {
+pub fn main() {
     let _v = [0, .. Bunny as uint];
     let _v = [0, .. BAR];
     let _v = [0, .. BAR2];

src/test/run-pass/expr-repeat-vstore.rs

@@ -1,6 +1,6 @@
 use std::io::println;
 
-fn main() {
+pub fn main() {
     let v: ~[int] = ~[ 1, ..5 ];
     println(v[0].to_str());
     println(v[1].to_str());

src/test/run-pass/extern-call-direct.rs

@@ -12,7 +12,7 @@
 
 extern fn f(x: uint) -> uint { x * 2 }
 
-fn main() {
+pub fn main() {
     #[fixed_stack_segment];
 
     let x = f(22);

src/test/run-pass/extern-compare-with-return-type.rs

@@ -19,7 +19,7 @@ extern fn uintvoidret(_x: uint) {}
 
 extern fn uintuintuintuintret(x: uint, y: uint, z: uint) -> uint { x+y+z }
 
-fn main() {
+pub fn main() {
     assert_eq!(voidret1, voidret1);
     assert!(voidret1 != voidret2);
 

src/test/run-pass/extoption_env-not-defined.rs

@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn main() {
+pub fn main() {
     assert!(option_env!("__HOPEFULLY_DOESNT_EXIST__").is_none());
 }

src/test/run-pass/filter-block-view-items.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn main() {
+pub fn main() {
     // Make sure that this view item is filtered out because otherwise it would
     // trigger a compilation error
     #[cfg(not_present)] use foo = bar;

src/test/run-pass/foreach-external-iterators-break.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn main() {
+pub fn main() {
     let x = [1,..100];
     let mut y = 0;
     for i in x.iter() {

src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs

@@ -14,7 +14,7 @@ use std::hashmap::HashMap;
 // outside the loop, breaks, then _picks back up_ and continues
 // iterating with it.
 
-fn main() {
+pub fn main() {
     let mut h = HashMap::new();
     let kvs = [(1, 10), (2, 20), (3, 30)];
     for &(k,v) in kvs.iter() {
@@ -38,4 +38,4 @@ fn main() {
 
     assert_eq!(x, 6);
     assert_eq!(y, 60);
-}
+}

src/test/run-pass/foreach-external-iterators-hashmap.rs

@@ -10,7 +10,7 @@
 
 use std::hashmap::HashMap;
 
-fn main() {
+pub fn main() {
     let mut h = HashMap::new();
     let kvs = [(1, 10), (2, 20), (3, 30)];
     for &(k,v) in kvs.iter() {
@@ -24,4 +24,4 @@ fn main() {
     }
     assert_eq!(x, 6);
     assert_eq!(y, 60);
-}
+}

src/test/run-pass/foreach-external-iterators-loop.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn main() {
+pub fn main() {
     let x = [1,..100];
     let mut y = 0;
     for (n,i) in x.iter().enumerate() {

src/test/run-pass/foreach-external-iterators-nested.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn main() {
+pub fn main() {
     let x = [1,..100];
     let y = [2,..100];
     let mut p = 0;

src/test/run-pass/foreach-external-iterators.rs

@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn main() {
+pub fn main() {
     let x = [1,..100];
     let mut y = 0;
     for i in x.iter() {
         y += *i
     }
     assert!(y == 100);
-}
+}

src/test/run-pass/func-arg-incomplete-pattern.rs

@@ -11,10 +11,10 @@ fn foo(Foo {x, _}: Foo) -> *uint {
     addr
 }
 
-fn main() {
+pub fn main() {
     let obj = ~1;
     let objptr: *uint = &*obj;
     let f = Foo {x: obj, y: ~2};
     let xptr = foo(f);
     assert_eq!(objptr, xptr);
-}
+}

src/test/run-pass/func-arg-ref-pattern.rs

@@ -13,7 +13,7 @@ fn checkval(~ref x: ~uint) -> uint {
     *x
 }
 
-fn main() {
+pub fn main() {
     let obj = ~1;
     let objptr: *uint = &*obj;
     let xptr = getaddr(obj);

src/test/run-pass/func-arg-wild-pattern.rs

@@ -5,6 +5,6 @@ fn foo((x, _): (int, int)) -> int {
     x
 }
 
-fn main() {
+pub fn main() {
     assert_eq!(foo((22, 23)), 22);
 }