Change crust -> extern.

Author: graydon

src/libcore/task.rs

@@ -612,7 +612,7 @@ type task_local_element = (*libc::c_void, *libc::c_void, fn@(+*libc::c_void));
 // Has to be a pointer at outermost layer; the foreign call returns void *.
 type task_local_map = @dvec::dvec<option<task_local_element>>;
 
-crust fn cleanup_task_local_map(map_ptr: *libc::c_void) unsafe {
+extern fn cleanup_task_local_map(map_ptr: *libc::c_void) unsafe {
     assert !map_ptr.is_null();
     // Get and keep the single reference that was created at the beginning.
     let map: task_local_map = unsafe::reinterpret_cast(map_ptr);
@@ -1250,7 +1250,7 @@ fn test_tls_modify() unsafe {
 #[test]
 fn test_tls_crust_automorestack_memorial_bug() unsafe {
     // This might result in a stack-canary clobber if the runtime fails to set
-    // sp_limit to 0 when calling the cleanup crust - it might automatically
+    // sp_limit to 0 when calling the cleanup extern - it might automatically
     // jump over to the rust stack, which causes next_c_sp to get recorded as
     // something within a rust stack segment. Then a subsequent upcall (esp.
     // for logging, think vsnprintf) would run on a stack smaller than 1 MB.

src/libstd/net_ip.rs

@@ -257,7 +257,7 @@ type get_addr_data = {
     output_ch: comm::chan<result::result<[ip_addr]/~,ip_get_addr_err>>
 };
 
-crust fn get_addr_cb(handle: *uv_getaddrinfo_t, status: libc::c_int,
+extern fn get_addr_cb(handle: *uv_getaddrinfo_t, status: libc::c_int,
                      res: *addrinfo) unsafe {
     log(debug, "in get_addr_cb");
     let handle_data = get_data_for_req(handle) as

src/libstd/net_tcp.rs

@@ -1031,13 +1031,13 @@ type tcp_listen_fc_data = {
     mut active: bool
 };
 
-crust fn tcp_lfc_close_cb(handle: *uv::ll::uv_tcp_t) unsafe {
+extern fn tcp_lfc_close_cb(handle: *uv::ll::uv_tcp_t) unsafe {
     let server_data_ptr = uv::ll::get_data_for_uv_handle(
         handle) as *tcp_listen_fc_data;
     comm::send((*server_data_ptr).stream_closed_ch, ());
 }
 
-crust fn tcp_lfc_on_connection_cb(handle: *uv::ll::uv_tcp_t,
+extern fn tcp_lfc_on_connection_cb(handle: *uv::ll::uv_tcp_t,
                                      status: libc::c_int) unsafe {
     let server_data_ptr = uv::ll::get_data_for_uv_handle(handle)
         as *tcp_listen_fc_data;
@@ -1094,7 +1094,7 @@ impl of to_tcp_err_iface for uv::ll::uv_err_data {
     }
 }
 
-crust fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,
+extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,
                     nread: libc::ssize_t,
                     ++buf: uv::ll::uv_buf_t) unsafe {
     log(debug, #fmt("entering on_tcp_read_cb stream: %? nread: %?",
@@ -1128,7 +1128,7 @@ crust fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,
     log(debug, "exiting on_tcp_read_cb");
 }
 
-crust fn on_alloc_cb(handle: *libc::c_void,
+extern fn on_alloc_cb(handle: *libc::c_void,
                      ++suggested_size: size_t)
     -> uv::ll::uv_buf_t unsafe {
     log(debug, "tcp read on_alloc_cb!");
@@ -1144,15 +1144,15 @@ type tcp_socket_close_data = {
     closed_ch: comm::chan<()>
 };
 
-crust fn tcp_socket_dtor_close_cb(handle: *uv::ll::uv_tcp_t) unsafe {
+extern fn tcp_socket_dtor_close_cb(handle: *uv::ll::uv_tcp_t) unsafe {
     let data = uv::ll::get_data_for_uv_handle(handle)
         as *tcp_socket_close_data;
     let closed_ch = (*data).closed_ch;
     comm::send(closed_ch, ());
     log(debug, "tcp_socket_dtor_close_cb exiting..");
 }
 
-crust fn tcp_write_complete_cb(write_req: *uv::ll::uv_write_t,
+extern fn tcp_write_complete_cb(write_req: *uv::ll::uv_write_t,
                               status: libc::c_int) unsafe {
     let write_data_ptr = uv::ll::get_data_for_req(write_req)
         as *write_req_data;
@@ -1178,18 +1178,18 @@ type connect_req_data = {
     closed_signal_ch: comm::chan<()>
 };
 
-crust fn stream_error_close_cb(handle: *uv::ll::uv_tcp_t) unsafe {
+extern fn stream_error_close_cb(handle: *uv::ll::uv_tcp_t) unsafe {
     let data = uv::ll::get_data_for_uv_handle(handle) as
         *connect_req_data;
     comm::send((*data).closed_signal_ch, ());
     log(debug, #fmt("exiting steam_error_close_cb for %?", handle));
 }
 
-crust fn tcp_connect_close_cb(handle: *uv::ll::uv_tcp_t) unsafe {
+extern fn tcp_connect_close_cb(handle: *uv::ll::uv_tcp_t) unsafe {
     log(debug, #fmt("closed client tcp handle %?", handle));
 }
 
-crust fn tcp_connect_on_connect_cb(connect_req_ptr: *uv::ll::uv_connect_t,
+extern fn tcp_connect_on_connect_cb(connect_req_ptr: *uv::ll::uv_connect_t,
                                    status: libc::c_int) unsafe {
     let conn_data_ptr = (uv::ll::get_data_for_req(connect_req_ptr)
                       as *connect_req_data);

src/libstd/timer.rs

@@ -116,7 +116,7 @@ fn recv_timeout<T: copy send>(iotask: iotask,
 }
 
 // INTERNAL API
-crust fn delayed_send_cb(handle: *uv::ll::uv_timer_t,
+extern fn delayed_send_cb(handle: *uv::ll::uv_timer_t,
                                 status: libc::c_int) unsafe {
     log(debug, #fmt("delayed_send_cb handle %? status %?", handle, status));
     let timer_done_ch =
@@ -133,7 +133,7 @@ crust fn delayed_send_cb(handle: *uv::ll::uv_timer_t,
     }
 }
 
-crust fn delayed_send_close_cb(handle: *uv::ll::uv_timer_t) unsafe {
+extern fn delayed_send_close_cb(handle: *uv::ll::uv_timer_t) unsafe {
     log(debug, #fmt("delayed_send_close_cb handle %?", handle));
     let timer_done_ch =
         *(uv::ll::get_data_for_uv_handle(handle) as *comm::chan<()>);

src/libstd/uv_global_loop.rs

@@ -116,15 +116,15 @@ fn spawn_loop() -> iotask unsafe {
 
 #[cfg(test)]
 mod test {
-    crust fn simple_timer_close_cb(timer_ptr: *ll::uv_timer_t) unsafe {
+    extern fn simple_timer_close_cb(timer_ptr: *ll::uv_timer_t) unsafe {
         let exit_ch_ptr = ll::get_data_for_uv_handle(
             timer_ptr as *libc::c_void) as *comm::chan<bool>;
         let exit_ch = *exit_ch_ptr;
         comm::send(exit_ch, true);
         log(debug, #fmt("EXIT_CH_PTR simple_timer_close_cb exit_ch_ptr: %?",
                        exit_ch_ptr));
     }
-    crust fn simple_timer_cb(timer_ptr: *ll::uv_timer_t,
+    extern fn simple_timer_cb(timer_ptr: *ll::uv_timer_t,
                              _status: libc::c_int) unsafe {
         log(debug, "in simple timer cb");
         ll::timer_stop(timer_ptr);

src/libstd/uv_iotask.rs

@@ -148,10 +148,10 @@ fn send_msg(iotask: iotask,
 }
 
 #[doc ="Dispatch all pending messages"]
-crust fn wake_up_cb(async_handle: *ll::uv_async_t,
+extern fn wake_up_cb(async_handle: *ll::uv_async_t,
                     status: int) unsafe {
 
-    log(debug, #fmt("wake_up_cb crust.. handle: %? status: %?",
+    log(debug, #fmt("wake_up_cb extern.. handle: %? status: %?",
                      async_handle, status));
 
     let loop_ptr = ll::get_loop_for_uv_handle(async_handle);
@@ -176,7 +176,7 @@ fn begin_teardown(data: *iotask_loop_data) unsafe {
     ll::close(async_handle as *c_void, tear_down_close_cb);
 }
 
-crust fn tear_down_close_cb(handle: *ll::uv_async_t) unsafe {
+extern fn tear_down_close_cb(handle: *ll::uv_async_t) unsafe {
     let loop_ptr = ll::get_loop_for_uv_handle(handle);
     let loop_refs = ll::loop_refcount(loop_ptr);
     log(debug, #fmt("tear_down_close_cb called, closing handle at %? refs %?",
@@ -186,13 +186,13 @@ crust fn tear_down_close_cb(handle: *ll::uv_async_t) unsafe {
 
 #[cfg(test)]
 mod test {
-    crust fn async_close_cb(handle: *ll::uv_async_t) unsafe {
+    extern fn async_close_cb(handle: *ll::uv_async_t) unsafe {
         log(debug, #fmt("async_close_cb handle %?", handle));
         let exit_ch = (*(ll::get_data_for_uv_handle(handle)
                         as *ah_data)).exit_ch;
         comm::send(exit_ch, ());
     }
-    crust fn async_handle_cb(handle: *ll::uv_async_t, status: libc::c_int)
+    extern fn async_handle_cb(handle: *ll::uv_async_t, status: libc::c_int)
         unsafe {
         log(debug, #fmt("async_handle_cb handle %? status %?",handle,status));
         ll::close(handle, async_close_cb);
@@ -231,11 +231,11 @@ mod test {
         ret comm::recv(iotask_port);
     }
 
-    crust fn lifetime_handle_close(handle: *libc::c_void) unsafe {
+    extern fn lifetime_handle_close(handle: *libc::c_void) unsafe {
         log(debug, #fmt("lifetime_handle_close ptr %?", handle));
     }
 
-    crust fn lifetime_async_callback(handle: *libc::c_void,
+    extern fn lifetime_async_callback(handle: *libc::c_void,
                                      status: libc::c_int) {
         log(debug, #fmt("lifetime_handle_close ptr %? status %?",
                         handle, status));

src/libstd/uv_ll.rs

@@ -1016,12 +1016,12 @@ mod test {
         read_chan: *comm::chan<str>
     };
 
-    crust fn after_close_cb(handle: *libc::c_void) {
+    extern fn after_close_cb(handle: *libc::c_void) {
         log(debug, #fmt("after uv_close! handle ptr: %?",
                         handle));
     }
 
-    crust fn on_alloc_cb(handle: *libc::c_void,
+    extern fn on_alloc_cb(handle: *libc::c_void,
                          ++suggested_size: libc::size_t)
         -> uv_buf_t unsafe {
         log(debug, "on_alloc_cb!");
@@ -1033,7 +1033,7 @@ mod test {
         ret buf_init(char_ptr, suggested_size as uint);
     }
 
-    crust fn on_read_cb(stream: *uv_stream_t,
+    extern fn on_read_cb(stream: *uv_stream_t,
                         nread: libc::ssize_t,
                         ++buf: uv_buf_t) unsafe {
         let nread = nread as int;
@@ -1067,7 +1067,7 @@ mod test {
         log(debug, "CLIENT exiting on_read_cb");
     }
 
-    crust fn on_write_complete_cb(write_req: *uv_write_t,
+    extern fn on_write_complete_cb(write_req: *uv_write_t,
                                   status: libc::c_int) unsafe {
         log(debug, #fmt("CLIENT beginning on_write_complete_cb status: %d",
                          status as int));
@@ -1079,7 +1079,7 @@ mod test {
                          result as int));
     }
 
-    crust fn on_connect_cb(connect_req_ptr: *uv_connect_t,
+    extern fn on_connect_cb(connect_req_ptr: *uv_connect_t,
                                  status: libc::c_int) unsafe {
         log(debug, #fmt("beginning on_connect_cb .. status: %d",
                          status as int));
@@ -1184,12 +1184,12 @@ mod test {
 
     }
 
-    crust fn server_after_close_cb(handle: *libc::c_void) unsafe {
+    extern fn server_after_close_cb(handle: *libc::c_void) unsafe {
         log(debug, #fmt("SERVER server stream closed, should exit.. h: %?",
                    handle));
     }
 
-    crust fn client_stream_after_close_cb(handle: *libc::c_void)
+    extern fn client_stream_after_close_cb(handle: *libc::c_void)
         unsafe {
         log(debug, "SERVER: closed client stream, now closing server stream");
         let client_data = get_data_for_uv_handle(
@@ -1199,15 +1199,15 @@ mod test {
                       server_after_close_cb);
     }
 
-    crust fn after_server_resp_write(req: *uv_write_t) unsafe {
+    extern fn after_server_resp_write(req: *uv_write_t) unsafe {
         let client_stream_ptr =
             get_stream_handle_from_write_req(req);
         log(debug, "SERVER: resp sent... closing client stream");
         close(client_stream_ptr as *libc::c_void,
                       client_stream_after_close_cb)
     }
 
-    crust fn on_server_read_cb(client_stream_ptr: *uv_stream_t,
+    extern fn on_server_read_cb(client_stream_ptr: *uv_stream_t,
                                nread: libc::ssize_t,
                                ++buf: uv_buf_t) unsafe {
         let nread = nread as int;
@@ -1268,7 +1268,7 @@ mod test {
         log(debug, "SERVER exiting on_read_cb");
     }
 
-    crust fn server_connection_cb(server_stream_ptr:
+    extern fn server_connection_cb(server_stream_ptr:
                                     *uv_stream_t,
                                   status: libc::c_int) unsafe {
         log(debug, "client connecting!");
@@ -1335,12 +1335,12 @@ mod test {
         continue_chan: *comm::chan<bool>
     };
 
-    crust fn async_close_cb(handle: *libc::c_void) {
+    extern fn async_close_cb(handle: *libc::c_void) {
         log(debug, #fmt("SERVER: closing async cb... h: %?",
                    handle));
     }
 
-    crust fn continue_async_cb(async_handle: *uv_async_t,
+    extern fn continue_async_cb(async_handle: *uv_async_t,
                                status: libc::c_int) unsafe {
         // once we're in the body of this callback,
         // the tcp server's loop is set up, so we

src/libsyntax/ast.rs

@@ -563,7 +563,7 @@ enum purity {
     pure_fn, // declared with "pure fn"
     unsafe_fn, // declared with "unsafe fn"
     impure_fn, // declared with "fn"
-    extern_fn, // declared with "crust fn"
+    extern_fn, // declared with "extern fn"
 }
 
 #[auto_serialize]

src/rustc/middle/trans/foreign.rs

@@ -1009,7 +1009,7 @@ fn trans_foreign_fn(ccx: @crate_ctxt, path: ast_map::path, decl: ast::fn_decl,
 
         fn build_args(bcx: block, tys: @c_stack_tys,
                       llargbundle: ValueRef) -> ~[ValueRef] {
-            let _icx = bcx.insn_ctxt("foreign::crust::shim::build_args");
+            let _icx = bcx.insn_ctxt("foreign::extern::shim::build_args");
             let mut llargvals = ~[];
             let mut i = 0u;
             let n = vec::len(tys.arg_tys);

src/rustc/middle/typeck/check.rs

@@ -2031,7 +2031,7 @@ fn ty_param_bounds_and_ty_for_def(fcx: @fn_ctxt, sp: span, defn: ast::def) ->
         }
       }
       ast::def_fn(id, ast::extern_fn) {
-        // Crust functions are just u8 pointers
+        // extern functions are just u8 pointers
         ret {
             bounds: @~[],
             rp: ast::rp_none,

src/test/compile-fail/crust-no-call.rs renamed to src/test/compile-fail/extern-no-call.rs

@@ -1,5 +1,5 @@
 // error-pattern:expected function or foreign function but found *u8
-crust fn f() {
+extern fn f() {
 }
 
 fn main() {

src/test/compile-fail/crust-wrong-value-type.rs renamed to src/test/compile-fail/extern-wrong-value-type.rs

@@ -1,8 +1,8 @@
 // error-pattern:expected `fn()` but found `*u8`
-crust fn f() {
+extern fn f() {
 }
 
 fn main() {
-    // Crust functions are *u8 types
+    // extern functions are *u8 types
     let _x: fn() = f;
 }

src/test/run-fail/crust-fail.rs renamed to src/test/run-fail/extern-fail.rs

@@ -7,7 +7,7 @@ extern mod rustrt {
                      data: libc::uintptr_t) -> libc::uintptr_t;
 }
 
-crust fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
+extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
     if data == 1u {
         data
     } else {

src/test/run-pass/crust-1.rs renamed to src/test/run-pass/extern-1.rs

@@ -1,4 +1,4 @@
-crust fn f() {
+extern fn f() {
 }
 
 fn main() {

src/test/run-pass/crust-call-deep.rs renamed to src/test/run-pass/extern-call-deep.rs

@@ -3,7 +3,7 @@ extern mod rustrt {
                      data: libc::uintptr_t) -> libc::uintptr_t;
 }
 
-crust fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
+extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
     if data == 1u {
         data
     } else {

src/test/run-pass/crust-call-deep2.rs renamed to src/test/run-pass/extern-call-deep2.rs

@@ -3,7 +3,7 @@ extern mod rustrt {
                      data: libc::uintptr_t) -> libc::uintptr_t;
 }
 
-crust fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
+extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
     if data == 1u {
         data
     } else {

src/test/run-pass/crust-call-scrub.rs renamed to src/test/run-pass/extern-call-scrub.rs

@@ -7,7 +7,7 @@ extern mod rustrt {
                      data: libc::uintptr_t) -> libc::uintptr_t;
 }
 
-crust fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
+extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
     if data == 1u {
         data
     } else {

src/test/run-pass/crust-call.rs renamed to src/test/run-pass/extern-call.rs

@@ -3,7 +3,7 @@ extern mod rustrt {
                      data: libc::uintptr_t) -> libc::uintptr_t;
 }
 
-crust fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
+extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
     if data == 1u {
         data
     } else {

src/test/run-pass/crust-stress.rs renamed to src/test/run-pass/extern-stress.rs

@@ -6,7 +6,7 @@ extern mod rustrt {
                      data: libc::uintptr_t) -> libc::uintptr_t;
 }
 
-crust fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
+extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
     if data == 1u {
         data
     } else {