---

yaml
---
r: 2844
b: refs/heads/master
c: e66f9e4
h: refs/heads/master
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d68cbdff00d055c1fd5168227803a987a4a4a51
+refs/heads/master: e66f9e46f64a388db232cd3d2c20c4c9fcc87a44

trunk/src/comp/middle/trans.rs

@@ -7835,7 +7835,7 @@ fn trans_main_fn(@local_ctxt cx, ValueRef crate_map) {
     auto llmain =
         decl_cdecl_fn(cx.ccx.llmod, main_name, T_fn(T_main_args, T_int()));
 
-    auto llrust_start = decl_cdecl_fn(cx.ccx.llmod, "new_rust_start",
+    auto llrust_start = decl_cdecl_fn(cx.ccx.llmod, "rust_start",
                                       T_fn(T_rust_start_args, T_int()));
 
     auto llargc = llvm::LLVMGetParam(llmain, 0u);

trunk/src/rt/rust.cpp

@@ -77,7 +77,7 @@ command_line_args : public dom_owned<command_line_args>
  */
 
 extern "C" CDECL int
-new_rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
+rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
 
     update_log_settings(crate_map, getenv("RUST_LOG"));
     rust_srv *srv = new rust_srv();
@@ -114,8 +114,8 @@ new_rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
 }
 
 extern "C" CDECL int
-rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
-    return new_rust_start(main_fn, argc, argv, crate_map);
+new_rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
+    return rust_start(main_fn, argc, argv, crate_map);
 }
 
 //