diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2012-07-03 16:11:00 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2012-07-03 16:11:00 -0700 |
| commit | debb7e4641af2ea71cf8733b3f071d614803dcbd (patch) | |
| tree | 3c087869d79d340300a1383b95b994b2fce43517 /src/libstd | |
| parent | 7259195caff1fdcce6266e6ecf51c0fd614e041f (diff) | |
| download | rust-debb7e4641af2ea71cf8733b3f071d614803dcbd.tar.gz rust-debb7e4641af2ea71cf8733b3f071d614803dcbd.zip | |
Switch 'native' to 'extern' (or 'foreign' in some descriptions)
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/c_vec.rs | 10 | ||||
| -rw-r--r-- | src/libstd/dbg.rs | 2 | ||||
| -rw-r--r-- | src/libstd/net_tcp.rs | 2 | ||||
| -rw-r--r-- | src/libstd/test.rs | 2 | ||||
| -rw-r--r-- | src/libstd/time.rs | 2 | ||||
| -rw-r--r-- | src/libstd/unicode.rs | 2 | ||||
| -rw-r--r-- | src/libstd/uv_global_loop.rs | 2 | ||||
| -rw-r--r-- | src/libstd/uv_ll.rs | 26 |
8 files changed, 24 insertions, 24 deletions
diff --git a/src/libstd/c_vec.rs b/src/libstd/c_vec.rs index 02ed63981b9..258bc432da1 100644 --- a/src/libstd/c_vec.rs +++ b/src/libstd/c_vec.rs @@ -32,7 +32,7 @@ export len; export ptr; #[doc = " -The type representing a native chunk of memory +The type representing a foreign chunk of memory Wrapped in a enum for opacity; FIXME #818 when it is possible to have truly opaque types, this should be revisited. @@ -57,11 +57,11 @@ class dtor_res { */ #[doc = " -Create a `c_vec` from a native buffer with a given length. +Create a `c_vec` from a foreign buffer with a given length. # Arguments -* base - A native pointer to a buffer +* base - A foreign pointer to a buffer * len - The number of elements in the buffer "] unsafe fn c_vec<T>(base: *mut T, len: uint) -> c_vec<T> { @@ -73,12 +73,12 @@ unsafe fn c_vec<T>(base: *mut T, len: uint) -> c_vec<T> { } #[doc = " -Create a `c_vec` from a native buffer, with a given length, +Create a `c_vec` from a foreign buffer, with a given length, and a function to run upon destruction. # Arguments -* base - A native pointer to a buffer +* base - A foreign pointer to a buffer * len - The number of elements in the buffer * dtor - A function to run when the value is destructed, useful for freeing the buffer, etc. diff --git a/src/libstd/dbg.rs b/src/libstd/dbg.rs index 39746eae55e..be0330e543a 100644 --- a/src/libstd/dbg.rs +++ b/src/libstd/dbg.rs @@ -11,7 +11,7 @@ export ptr_cast; export breakpoint; #[abi = "cdecl"] -native mod rustrt { +extern mod rustrt { fn debug_tydesc(td: *sys::type_desc); fn debug_opaque(td: *sys::type_desc, x: *()); fn debug_box(td: *sys::type_desc, x: *()); diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs index cfae6a3ba13..3c9beb24198 100644 --- a/src/libstd/net_tcp.rs +++ b/src/libstd/net_tcp.rs @@ -28,7 +28,7 @@ export listen, accept; export connect; #[nolink] -native mod rustrt { +extern mod rustrt { fn rust_uv_current_kernel_malloc(size: libc::c_uint) -> *libc::c_void; fn rust_uv_current_kernel_free(mem: *libc::c_void); fn rust_uv_helper_uv_tcp_t_size() -> libc::c_uint; diff --git a/src/libstd/test.rs b/src/libstd/test.rs index 42ff9f6366a..bbf895840d8 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -22,7 +22,7 @@ export tr_ignored; export run_tests_console; #[abi = "cdecl"] -native mod rustrt { +extern mod rustrt { fn sched_threads() -> libc::size_t; } diff --git a/src/libstd/time.rs b/src/libstd/time.rs index fa1597925bd..ba53bdbf014 100644 --- a/src/libstd/time.rs +++ b/src/libstd/time.rs @@ -17,7 +17,7 @@ export strptime; #[abi = "cdecl"] -native mod rustrt { +extern mod rustrt { fn get_time(&sec: i64, &nsec: i32); fn precise_time_ns(&ns: u64); diff --git a/src/libstd/unicode.rs b/src/libstd/unicode.rs index c5bfd302305..df2c28be7c9 100644 --- a/src/libstd/unicode.rs +++ b/src/libstd/unicode.rs @@ -148,7 +148,7 @@ mod icu { #[link_name = "icuuc"] #[abi = "cdecl"] - native mod libicu { + extern mod libicu { pure fn u_hasBinaryProperty(c: UChar32, which: UProperty) -> UBool; pure fn u_isdigit(c: UChar32) -> UBool; pure fn u_islower(c: UChar32) -> UBool; diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs index aab8040c0a4..611100f61f7 100644 --- a/src/libstd/uv_global_loop.rs +++ b/src/libstd/uv_global_loop.rs @@ -12,7 +12,7 @@ import priv::{chan_from_global_ptr, weaken_task}; import comm::{port, chan, methods, select2, listen}; import either::{left, right}; -native mod rustrt { +extern mod rustrt { fn rust_uv_get_kernel_global_chan_ptr() -> *libc::uintptr_t; } diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs index ff3ed3b9a6b..d2722998299 100644 --- a/src/libstd/uv_ll.rs +++ b/src/libstd/uv_ll.rs @@ -556,7 +556,7 @@ mod uv_ll_struct_stubgen { } #[nolink] -native mod rustrt { +extern mod rustrt { // libuv public API fn rust_uv_loop_new() -> *libc::c_void; fn rust_uv_loop_delete(lp: *libc::c_void); @@ -705,7 +705,7 @@ unsafe fn tcp_connect(connect_ptr: *uv_connect_t, addr_ptr: *sockaddr_in, ++after_connect_cb: *u8) -> libc::c_int { - log(debug, #fmt("b4 native tcp_connect--addr port: %u cb: %u", + log(debug, #fmt("b4 foreign tcp_connect--addr port: %u cb: %u", (*addr_ptr).sin_port as uint, after_connect_cb as uint)); ret rustrt::rust_uv_tcp_connect(connect_ptr, tcp_handle_ptr, after_connect_cb, addr_ptr); @@ -1527,7 +1527,7 @@ mod test { fn test_uv_ll_struct_size_uv_tcp_t() { let foreign_handle_size = rustrt::rust_uv_helper_uv_tcp_t_size(); let rust_handle_size = sys::size_of::<uv_tcp_t>(); - let output = #fmt("uv_tcp_t -- native: %u rust: %u", + let output = #fmt("uv_tcp_t -- foreign: %u rust: %u", foreign_handle_size as uint, rust_handle_size); log(debug, output); assert foreign_handle_size as uint == rust_handle_size; @@ -1538,7 +1538,7 @@ mod test { let foreign_handle_size = rustrt::rust_uv_helper_uv_connect_t_size(); let rust_handle_size = sys::size_of::<uv_connect_t>(); - let output = #fmt("uv_connect_t -- native: %u rust: %u", + let output = #fmt("uv_connect_t -- foreign: %u rust: %u", foreign_handle_size as uint, rust_handle_size); log(debug, output); assert foreign_handle_size as uint == rust_handle_size; @@ -1549,7 +1549,7 @@ mod test { let foreign_handle_size = rustrt::rust_uv_helper_uv_buf_t_size(); let rust_handle_size = sys::size_of::<uv_buf_t>(); - let output = #fmt("uv_buf_t -- native: %u rust: %u", + let output = #fmt("uv_buf_t -- foreign: %u rust: %u", foreign_handle_size as uint, rust_handle_size); log(debug, output); assert foreign_handle_size as uint == rust_handle_size; @@ -1560,7 +1560,7 @@ mod test { let foreign_handle_size = rustrt::rust_uv_helper_uv_write_t_size(); let rust_handle_size = sys::size_of::<uv_write_t>(); - let output = #fmt("uv_write_t -- native: %u rust: %u", + let output = #fmt("uv_write_t -- foreign: %u rust: %u", foreign_handle_size as uint, rust_handle_size); log(debug, output); assert foreign_handle_size as uint == rust_handle_size; @@ -1572,7 +1572,7 @@ mod test { let foreign_handle_size = rustrt::rust_uv_helper_sockaddr_in_size(); let rust_handle_size = sys::size_of::<sockaddr_in>(); - let output = #fmt("sockaddr_in -- native: %u rust: %u", + let output = #fmt("sockaddr_in -- foreign: %u rust: %u", foreign_handle_size as uint, rust_handle_size); log(debug, output); assert foreign_handle_size as uint == rust_handle_size; @@ -1583,7 +1583,7 @@ mod test { let native_handle_size = rustrt::rust_uv_helper_sockaddr_in6_size(); let rust_handle_size = sys::size_of::<sockaddr_in6>(); - let output = #fmt("sockaddr_in6 -- native: %u rust: %u", + let output = #fmt("sockaddr_in6 -- foreign: %u rust: %u", native_handle_size as uint, rust_handle_size); log(debug, output); // FIXME #1645 .. rust appears to pad structs to the nearest byte..? @@ -1598,7 +1598,7 @@ mod test { let native_handle_size = rustrt::rust_uv_helper_addr_in_size(); let rust_handle_size = sys::size_of::<addr_in>(); - let output = #fmt("addr_in -- native: %u rust: %u", + let output = #fmt("addr_in -- foreign: %u rust: %u", native_handle_size as uint, rust_handle_size); log(debug, output); // FIXME #1645 .. see note above about struct padding @@ -1611,7 +1611,7 @@ mod test { let foreign_handle_size = rustrt::rust_uv_helper_uv_async_t_size(); let rust_handle_size = sys::size_of::<uv_async_t>(); - let output = #fmt("uv_async_t -- native: %u rust: %u", + let output = #fmt("uv_async_t -- foreign: %u rust: %u", foreign_handle_size as uint, rust_handle_size); log(debug, output); assert foreign_handle_size as uint == rust_handle_size; @@ -1623,7 +1623,7 @@ mod test { let foreign_handle_size = rustrt::rust_uv_helper_uv_timer_t_size(); let rust_handle_size = sys::size_of::<uv_timer_t>(); - let output = #fmt("uv_timer_t -- native: %u rust: %u", + let output = #fmt("uv_timer_t -- foreign: %u rust: %u", foreign_handle_size as uint, rust_handle_size); log(debug, output); assert foreign_handle_size as uint == rust_handle_size; @@ -1636,7 +1636,7 @@ mod test { let native_handle_size = rustrt::rust_uv_helper_uv_getaddrinfo_t_size(); let rust_handle_size = sys::size_of::<uv_getaddrinfo_t>(); - let output = #fmt("uv_getaddrinfo_t -- native: %u rust: %u", + let output = #fmt("uv_getaddrinfo_t -- foreign: %u rust: %u", native_handle_size as uint, rust_handle_size); log(debug, output); assert native_handle_size as uint == rust_handle_size; @@ -1649,7 +1649,7 @@ mod test { let native_handle_size = rustrt::rust_uv_helper_addrinfo_size(); let rust_handle_size = sys::size_of::<addrinfo>(); - let output = #fmt("addrinfo -- native: %u rust: %u", + let output = #fmt("addrinfo -- foreign: %u rust: %u", native_handle_size as uint, rust_handle_size); log(debug, output); assert native_handle_size as uint == rust_handle_size; |
