libstd: Remove extern mod { ... } from libstd. rs=deexterning

Author: pcwalton

src/libstd/arena.rs

@@ -46,18 +46,26 @@ use core::sys;
 use core::uint;
 use core::vec;
 
-#[abi = "rust-intrinsic"]
-extern mod rusti {
-    fn move_val_init<T>(dst: &mut T, -src: T);
-    fn needs_drop<T>() -> bool;
+pub mod rusti {
+    #[abi = "rust-intrinsic"]
+    pub extern {
+        fn move_val_init<T>(dst: &mut T, -src: T);
+        fn needs_drop<T>() -> bool;
+    }
 }
 
-extern mod rustrt {
-    #[rust_stack]
-    unsafe fn rust_call_tydesc_glue(root: *u8,
-                                    tydesc: *TypeDesc,
-                                    field: size_t);
+pub mod rustrt {
+    use core::libc::size_t;
+    use core::sys::TypeDesc;
+
+    pub extern {
+        #[rust_stack]
+        unsafe fn rust_call_tydesc_glue(root: *u8,
+                                        tydesc: *TypeDesc,
+                                        field: size_t);
+    }
 }
+
 // This probably belongs somewhere else. Needs to be kept in sync with
 // changes to glue...
 const tydesc_drop_glue_index: size_t = 3 as size_t;

src/libstd/dbg.rs

@@ -14,15 +14,19 @@ use core::cast::reinterpret_cast;
 use core::ptr;
 use core::sys;
 
-#[abi = "cdecl"]
-extern mod rustrt {
-    pub unsafe fn debug_tydesc(td: *sys::TypeDesc);
-    pub unsafe fn debug_opaque(td: *sys::TypeDesc, x: *());
-    pub unsafe fn debug_box(td: *sys::TypeDesc, x: *());
-    pub unsafe fn debug_tag(td: *sys::TypeDesc, x: *());
-    pub unsafe fn debug_fn(td: *sys::TypeDesc, x: *());
-    pub unsafe fn debug_ptrcast(td: *sys::TypeDesc, x: *()) -> *();
-    pub unsafe fn rust_dbg_breakpoint();
+pub mod rustrt {
+    use core::sys;
+
+    #[abi = "cdecl"]
+    pub extern {
+        pub unsafe fn debug_tydesc(td: *sys::TypeDesc);
+        pub unsafe fn debug_opaque(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_box(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_tag(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_fn(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_ptrcast(td: *sys::TypeDesc, x: *()) -> *();
+        pub unsafe fn rust_dbg_breakpoint();
+    }
 }
 
 pub fn debug_tydesc<T>() {

src/libstd/net_tcp.rs

@@ -32,12 +32,16 @@ use core::result;
 use core::uint;
 use core::vec;
 
-#[nolink]
-extern mod rustrt {
-    unsafe fn rust_uv_current_kernel_malloc(size: libc::c_uint)
-                                         -> *libc::c_void;
-    unsafe fn rust_uv_current_kernel_free(mem: *libc::c_void);
-    unsafe fn rust_uv_helper_uv_tcp_t_size() -> libc::c_uint;
+pub mod rustrt {
+    use core::libc;
+
+    #[nolink]
+    pub extern {
+        unsafe fn rust_uv_current_kernel_malloc(size: libc::c_uint)
+                                             -> *libc::c_void;
+        unsafe fn rust_uv_current_kernel_free(mem: *libc::c_void);
+        unsafe fn rust_uv_helper_uv_tcp_t_size() -> libc::c_uint;
+    }
 }
 
 /**

src/libstd/rl.rs

@@ -16,14 +16,18 @@ use core::prelude::*;
 use core::str;
 use core::task;
 
-extern mod rustrt {
-    pub unsafe fn linenoise(prompt: *c_char) -> *c_char;
-    pub unsafe fn linenoiseHistoryAdd(line: *c_char) -> c_int;
-    pub unsafe fn linenoiseHistorySetMaxLen(len: c_int) -> c_int;
-    pub unsafe fn linenoiseHistorySave(file: *c_char) -> c_int;
-    pub unsafe fn linenoiseHistoryLoad(file: *c_char) -> c_int;
-    pub unsafe fn linenoiseSetCompletionCallback(callback: *u8);
-    pub unsafe fn linenoiseAddCompletion(completions: *(), line: *c_char);
+pub mod rustrt {
+    use core::libc::{c_char, c_int};
+
+    pub extern {
+        pub unsafe fn linenoise(prompt: *c_char) -> *c_char;
+        pub unsafe fn linenoiseHistoryAdd(line: *c_char) -> c_int;
+        pub unsafe fn linenoiseHistorySetMaxLen(len: c_int) -> c_int;
+        pub unsafe fn linenoiseHistorySave(file: *c_char) -> c_int;
+        pub unsafe fn linenoiseHistoryLoad(file: *c_char) -> c_int;
+        pub unsafe fn linenoiseSetCompletionCallback(callback: *u8);
+        pub unsafe fn linenoiseAddCompletion(completions: *(), line: *c_char);
+    }
 }
 
 /// Add a line to history

src/libstd/test.rs

@@ -35,9 +35,13 @@ use core::str;
 use core::task;
 use core::vec;
 
-#[abi = "cdecl"]
-extern mod rustrt {
-    pub unsafe fn rust_sched_threads() -> size_t;
+pub mod rustrt {
+    use core::libc::size_t;
+
+    #[abi = "cdecl"]
+    pub extern {
+        pub unsafe fn rust_sched_threads() -> size_t;
+    }
 }
 
 // The name of a test. By convention this follows the rules for rust

src/libstd/time.rs

@@ -19,18 +19,26 @@ use core::str;
 
 const NSEC_PER_SEC: i32 = 1_000_000_000_i32;
 
-#[abi = "cdecl"]
-extern mod rustrt {
-    pub unsafe fn get_time(sec: &mut i64, nsec: &mut i32);
-
-    pub unsafe fn precise_time_ns(ns: &mut u64);
-
-    pub unsafe fn rust_tzset();
-    // FIXME: The i64 values can be passed by-val when #2064 is fixed.
-    pub unsafe fn rust_gmtime(&&sec: i64, &&nsec: i32, &&result: Tm);
-    pub unsafe fn rust_localtime(&&sec: i64, &&nsec: i32, &&result: Tm);
-    pub unsafe fn rust_timegm(&&tm: Tm, sec: &mut i64);
-    pub unsafe fn rust_mktime(&&tm: Tm, sec: &mut i64);
+pub mod rustrt {
+    use super::Tm;
+
+    #[cfg(target_os = "linux")]
+    #[link_args = "-lrt"]
+    pub extern {}
+
+    #[abi = "cdecl"]
+    pub extern {
+        pub unsafe fn get_time(sec: &mut i64, nsec: &mut i32);
+
+        pub unsafe fn precise_time_ns(ns: &mut u64);
+
+        pub unsafe fn rust_tzset();
+        // FIXME: The i64 values can be passed by-val when #2064 is fixed.
+        pub unsafe fn rust_gmtime(&&sec: i64, &&nsec: i32, &&result: Tm);
+        pub unsafe fn rust_localtime(&&sec: i64, &&nsec: i32, &&result: Tm);
+        pub unsafe fn rust_timegm(&&tm: Tm, sec: &mut i64);
+        pub unsafe fn rust_mktime(&&tm: Tm, sec: &mut i64);
+    }
 }
 
 /// A record specifying a time value in seconds and nanoseconds.

src/libstd/unicode.rs

@@ -157,16 +157,19 @@ pub mod icu {
 
     pub const UCHAR_INVALID_CODE : UProperty = -1;
 
-    #[link_name = "icuuc"]
-    #[abi = "cdecl"]
-    pub extern mod libicu {
-        unsafe fn u_hasBinaryProperty(c: UChar32, which: UProperty) -> UBool;
-        unsafe fn u_isdigit(c: UChar32) -> UBool;
-        unsafe fn u_islower(c: UChar32) -> UBool;
-        unsafe fn u_isspace(c: UChar32) -> UBool;
-        unsafe fn u_isupper(c: UChar32) -> UBool;
-        unsafe fn u_tolower(c: UChar32) -> UChar32;
-        unsafe fn u_toupper(c: UChar32) -> UChar32;
+    pub mod libicu {
+        #[link_name = "icuuc"]
+        #[abi = "cdecl"]
+        pub extern {
+            unsafe fn u_hasBinaryProperty(c: UChar32, which: UProperty)
+                                       -> UBool;
+            unsafe fn u_isdigit(c: UChar32) -> UBool;
+            unsafe fn u_islower(c: UChar32) -> UBool;
+            unsafe fn u_isspace(c: UChar32) -> UBool;
+            unsafe fn u_isupper(c: UChar32) -> UBool;
+            unsafe fn u_tolower(c: UChar32) -> UChar32;
+            unsafe fn u_toupper(c: UChar32) -> UChar32;
+        }
     }
 }