---

yaml
---
r: 41963
b: refs/heads/master
c: ce954d1
h: refs/heads/master
i:
  41961: 0e8ee57
  41959: fef9b59
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8b2e7fc529526e24779e5cabd0c3b1a90e1da245
+refs/heads/master: ce954d117fd1e8b0ab320ed905726b658ccb7db0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/middle/trans/base.rs

@@ -62,7 +62,6 @@ use middle::trans::shape::*;
 use middle::trans::tvec;
 use middle::trans::type_of::*;
 use util::common::indenter;
-use util::common::is_main_name;
 use util::ppaux::{ty_to_str, ty_to_short_str};
 use util::ppaux;
 
@@ -2191,14 +2190,9 @@ fn is_main_fn(sess: &Session, node_id: ast::node_id) -> bool {
 
 // Create a _rust_main(args: ~[str]) function which will be called from the
 // runtime rust_start function
-fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef) {
-
-    if ccx.main_fn != None::<ValueRef> {
-        ccx.sess.span_fatal(sp, ~"multiple 'main' functions");
-    }
+fn create_main_wrapper(ccx: @crate_ctxt, _sp: span, main_llfn: ValueRef) {
 
     let llfn = create_main(ccx, main_llfn);
-    ccx.main_fn = Some(llfn);
     create_entry_fn(ccx, llfn);
 
     fn create_main(ccx: @crate_ctxt, main_llfn: ValueRef) -> ValueRef {
@@ -3008,7 +3002,6 @@ fn trans_crate(sess: session::Session,
               exp_map2: emap2,
               reachable: reachable,
               item_symbols: HashMap(),
-              mut main_fn: None::<ValueRef>,
               link_meta: link_meta,
               enum_sizes: ty::new_ty_hash(),
               discrims: HashMap(),

trunk/src/librustc/middle/trans/common.rs

@@ -163,7 +163,6 @@ struct crate_ctxt {
      exp_map2: resolve::ExportMap2,
      reachable: reachable::map,
      item_symbols: HashMap<ast::node_id, ~str>,
-     mut main_fn: Option<ValueRef>,
      link_meta: link_meta,
      enum_sizes: HashMap<ty::t, uint>,
      discrims: HashMap<ast::def_id, ValueRef>,

trunk/src/librustc/util/common.rs

@@ -101,12 +101,6 @@ fn local_rhs_span(l: @ast::local, def: span) -> span {
     }
 }
 
-fn is_main_name(path: syntax::ast_map::path) -> bool {
-    vec::last(path) == syntax::ast_map::path_name(
-        syntax::parse::token::special_idents::main
-    )
-}
-
 fn pluralize(n: uint, +s: ~str) -> ~str {
     if n == 1 { s }
     else { str::concat([s, ~"s"]) }