---

yaml
---
r: 41959
b: refs/heads/master
c: acde90d
h: refs/heads/master
i:
  41957: eafafd7
  41955: 6bd356e
  41951: 7f7d825
v: v3

Author: thestinger

[refs]

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

trunk/src/libcore/hashmap.rs

@@ -60,10 +60,6 @@ pub mod linear {
         ((capacity as float) * 3. / 4.) as uint
     }
 
-    pub fn LinearMap<K:Eq Hash,V>() -> LinearMap<K,V> {
-        linear_map_with_capacity(INITIAL_CAPACITY)
-    }
-
     pub fn linear_map_with_capacity<K:Eq Hash,V>(
         initial_capacity: uint) -> LinearMap<K,V> {
         let r = rand::Rng();
@@ -351,7 +347,7 @@ pub mod linear {
         }
     }
 
-    impl<K:Hash IterBytes Eq,V> LinearMap<K,V> {
+    pub impl<K:Hash IterBytes Eq,V> LinearMap<K,V> {
         static fn new() -> LinearMap<K, V> {
             linear_map_with_capacity(INITIAL_CAPACITY)
         }
@@ -495,7 +491,7 @@ pub mod linear {
 
     pub impl <T: Hash IterBytes Eq> LinearSet<T> {
         /// Create an empty LinearSet
-        static fn new() -> LinearSet<T> { LinearSet{map: LinearMap()} }
+        static fn new() -> LinearSet<T> { LinearSet{map: LinearMap::new()} }
     }
 }
 

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

@@ -62,6 +62,7 @@ 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;
 
@@ -2190,9 +2191,14 @@ 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) {
+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");
+    }
 
     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 {
@@ -3002,6 +3008,7 @@ 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,6 +163,7 @@ 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,6 +101,12 @@ 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"]) }

trunk/src/libstd/workcache.rs

@@ -259,7 +259,7 @@ impl Context {
     static fn new(db: @Mut<Database>,
                   lg: @Mut<Logger>,
                   cfg: @json::Object) -> Context {
-        Context {db: db, logger: lg, cfg: cfg, freshness: LinearMap()}
+        Context{db: db, logger: lg, cfg: cfg, freshness: LinearMap::new()}
     }
 
     fn prep<T:Owned
@@ -270,7 +270,7 @@ impl Context {
                   blk: fn(@Mut<Prep>)->Work<T>) -> Work<T> {
         let p = @Mut(Prep {ctxt: self,
                            fn_name: fn_name.to_owned(),
-                           declared_inputs: LinearMap()});
+                           declared_inputs: LinearMap::new()});
         blk(p)
     }
 }