---

yaml
---
r: 1407
b: refs/heads/master
c: 60f97aa
h: refs/heads/master
i:
  1405: a7a682f
  1403: 65c2a8b
  1399: 1377acd
  1391: e20878d
  1375: 5e268f1
  1343: 3c060be
  1279: 6706a1b
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbe8d222a82c14485cf416c4b85fd5e58363c0e0
+refs/heads/master: 60f97aa9cc73ee4e0b57abc07dc543c8fa823ee2

trunk/src/Makefile

@@ -492,6 +492,7 @@ TEST_XFAILS_RUSTC := $(filter-out \
                         int.rs \
                         i32-sub.rs \
                         i8-incr.rs \
+                        import.rs \
                         import2.rs \
                         import3.rs \
                         import4.rs \

trunk/src/comp/middle/trans.rs

@@ -4602,6 +4602,30 @@ fn create_crate_constant(@crate_ctxt cx) {
     llvm.LLVMSetInitializer(cx.crate_ptr, crate_val);
 }
 
+fn find_main_fn(@crate_ctxt cx) -> ValueRef {
+    auto e = sep() + "main";
+    let ValueRef v = C_nil();
+    let uint n = 0u;
+    for each (tup(str,ValueRef) i in cx.item_names.items()) {
+        if (_str.ends_with(i._0, e)) {
+            n += 1u;
+            v = i._1;
+        }
+    }
+    alt (n) {
+        case (0u) {
+            cx.sess.err("main fn not found");
+        }
+        case (1u) {
+            ret v;
+        }
+        case (_) {
+            cx.sess.err("multiple main fns found");
+        }
+    }
+    fail;
+}
+
 fn trans_main_fn(@crate_ctxt cx, ValueRef llcrate) {
     auto T_main_args = vec(T_int(), T_int());
     auto T_rust_start_args = vec(T_int(), T_int(), T_int(), T_int());
@@ -4621,8 +4645,7 @@ fn trans_main_fn(@crate_ctxt cx, ValueRef llcrate) {
 
     auto llargc = llvm.LLVMGetParam(llmain, 0u);
     auto llargv = llvm.LLVMGetParam(llmain, 1u);
-    check (cx.item_names.contains_key("_rust" + sep() + "main"));
-    auto llrust_main = cx.item_names.get("_rust"  + sep() + "main");
+    auto llrust_main = find_main_fn(cx);
 
     //
     // Emit the moral equivalent of: