---

yaml
---
r: 24531
b: refs/heads/try2
c: debb7e4
h: refs/heads/master
i:
  24529: c458c1c
  24527: 5358239
v: v3

Author: graydon

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 7259195caff1fdcce6266e6ecf51c0fd614e041f
+refs/heads/try2: debb7e4641af2ea71cf8733b3f071d614803dcbd
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/fuzzer/fuzzer.rs

@@ -454,7 +454,7 @@ fn content_is_dangerous_to_run(code: str) -> bool {
     let dangerous_patterns =
         ~["xfail-test",
          "import",  // espeically fs, run
-         "native",
+         "extern",
          "unsafe",
          "log"];    // python --> rust pipe deadlock?
 

branches/try2/src/libcore/arc.rs

@@ -9,7 +9,7 @@ export arc, get, clone, shared_arc, get_arc;
 export exclusive, methods;
 
 #[abi = "cdecl"]
-native mod rustrt {
+extern mod rustrt {
     #[rust_stack]
     fn rust_atomic_increment(p: &mut libc::intptr_t)
         -> libc::intptr_t;

branches/try2/src/libcore/cmath.rs

@@ -17,7 +17,7 @@ import libc::c_double;
 
 #[link_name = "m"]
 #[abi = "cdecl"]
-native mod c_double {
+extern mod c_double {
 
     // Alpabetically sorted by link_name
 
@@ -95,7 +95,7 @@ native mod c_double {
 
 #[link_name = "m"]
 #[abi = "cdecl"]
-native mod c_float {
+extern mod c_float {
 
     // Alpabetically sorted by link_name
 

branches/try2/src/libcore/comm.rs

@@ -258,7 +258,7 @@ enum rust_port {}
 type port_id = int;
 
 #[abi = "cdecl"]
-native mod rustrt {
+extern mod rustrt {
     fn rust_port_id_send(target_port: port_id, data: *()) -> libc::uintptr_t;
 
     fn new_port(unit_sz: libc::size_t) -> *rust_port;
@@ -280,7 +280,7 @@ native mod rustrt {
 }
 
 #[abi = "rust-intrinsic"]
-native mod rusti {
+extern mod rusti {
     fn init<T>() -> T;
 }
 

branches/try2/src/libcore/io.rs

@@ -14,7 +14,7 @@ import libc::consts::os::extra::*;
 type fd_t = c_int;
 
 #[abi = "cdecl"]
-native mod rustrt {
+extern mod rustrt {
     fn rust_get_stdin() -> *libc::FILE;
     fn rust_get_stdout() -> *libc::FILE;
     fn rust_get_stderr() -> *libc::FILE;
@@ -377,11 +377,11 @@ impl of writer for fd_t {
         }
     }
     fn seek(_offset: int, _whence: seek_style) {
-        #error("need 64-bit native calls for seek, sorry");
+        #error("need 64-bit foreign calls for seek, sorry");
         fail;
     }
     fn tell() -> uint {
-        #error("need 64-bit native calls for tell, sorry");
+        #error("need 64-bit foreign calls for tell, sorry");
         fail;
     }
     fn flush() -> int { 0 }

branches/try2/src/libcore/libc.rs

@@ -731,7 +731,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod ctype {
+        extern mod ctype {
             fn isalnum(c: c_int) -> c_int;
             fn isalpha(c: c_int) -> c_int;
             fn iscntrl(c: c_int) -> c_int;
@@ -749,7 +749,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod stdio {
+        extern mod stdio {
 
             fn fopen(filename: *c_char, mode: *c_char) -> *FILE;
             fn freopen(filename: *c_char, mode: *c_char,
@@ -793,7 +793,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod stdlib {
+        extern mod stdlib {
             fn abs(i: c_int) -> c_int;
             fn labs(i: c_long) -> c_long;
             // Omitted: div, ldiv (return type incomplete).
@@ -818,7 +818,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod string {
+        extern mod string {
 
             fn strcpy(dst: *c_char, src: *c_char) -> *c_char;
             fn strncpy(dst: *c_char, src: *c_char, n: size_t) -> *c_char;
@@ -856,7 +856,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod stat {
+        extern mod stat {
             #[link_name = "_chmod"]
             fn chmod(path: *c_char, mode: c_int) -> c_int;
 
@@ -866,7 +866,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod stdio {
+        extern mod stdio {
             #[link_name = "_popen"]
             fn popen(command: *c_char, mode: *c_char) -> *FILE;
 
@@ -882,7 +882,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod fcntl {
+        extern mod fcntl {
             #[link_name = "_open"]
             fn open(path: *c_char, oflag: c_int, mode: c_int) -> c_int;
 
@@ -892,13 +892,13 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod dirent {
+        extern mod dirent {
             // Not supplied at all.
         }
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod unistd {
+        extern mod unistd {
             #[link_name = "_access"]
             fn access(path: *c_char, amode: c_int) -> c_int;
 
@@ -966,7 +966,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod stat {
+        extern mod stat {
             fn chmod(path: *c_char, mode: mode_t) -> c_int;
             fn fchmod(fd: c_int, mode: mode_t) -> c_int;
             fn mkdir(path: *c_char, mode: mode_t) -> c_int;
@@ -975,7 +975,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod stdio {
+        extern mod stdio {
             fn popen(command: *c_char, mode: *c_char) -> *FILE;
             fn pclose(stream: *FILE) -> c_int;
             fn fdopen(fd: c_int, mode: *c_char) -> *FILE;
@@ -984,15 +984,15 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod fcntl {
+        extern mod fcntl {
             fn open(path: *c_char, oflag: c_int, mode: c_int) -> c_int;
             fn creat(path: *c_char, mode: mode_t) -> c_int;
             fn fcntl(fd: c_int, cmd: c_int) -> c_int;
         }
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod dirent {
+        extern mod dirent {
             fn opendir(dirname: *c_char) -> *DIR;
             fn closedir(dirp: *DIR) -> c_int;
             fn readdir(dirp: *DIR) -> *dirent;
@@ -1003,7 +1003,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod unistd {
+        extern mod unistd {
             fn access(path: *c_char, amode: c_int) -> c_int;
             fn alarm(seconds: c_uint) -> c_uint;
             fn chdir(dir: *c_char) -> c_int;
@@ -1056,7 +1056,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod unistd {
+        extern mod unistd {
             fn readlink(path: *c_char, buf: *mut c_char,
                         bufsz: size_t) -> ssize_t;
 
@@ -1073,7 +1073,7 @@ mod funcs {
 
         #[nolink]
         #[abi = "cdecl"]
-        native mod wait {
+        extern mod wait {
             fn waitpid(pid: pid_t, status: *mut c_int,
                        options: c_int) -> pid_t;
         }
@@ -1082,7 +1082,7 @@ mod funcs {
     #[cfg(target_os = "win32")]
     mod posix01 {
         #[nolink]
-        native mod unistd { }
+        extern mod unistd { }
     }
 
 
@@ -1092,15 +1092,15 @@ mod funcs {
     #[cfg(target_os = "freebsd")]
     mod posix08 {
         #[nolink]
-        native mod unistd { }
+        extern mod unistd { }
     }
 
 
     #[cfg(target_os = "macos")]
     #[cfg(target_os = "freebsd")]
     #[nolink]
     #[abi = "cdecl"]
-    native mod bsd44 {
+    extern mod bsd44 {
 
         fn sysctl(name: *c_int, namelen: c_uint,
                   oldp: *mut c_void, oldlenp: *mut size_t,
@@ -1124,7 +1124,7 @@ mod funcs {
     #[cfg(target_os = "macos")]
     #[nolink]
     #[abi = "cdecl"]
-    native mod extra {
+    extern mod extra {
         fn _NSGetExecutablePath(buf: *mut c_char,
                                 bufsize: *mut u32) -> c_int;
     }
@@ -1141,7 +1141,7 @@ mod funcs {
         import types::os::arch::extra::*;
 
         #[abi = "stdcall"]
-        native mod kernel32 {
+        extern mod kernel32 {
             fn GetEnvironmentVariableW(n: LPCWSTR,
                                        v: LPWSTR,
                                        nsize: DWORD) -> DWORD;
@@ -1165,7 +1165,7 @@ mod funcs {
 
         #[abi = "cdecl"]
         #[nolink]
-        native mod msvcrt {
+        extern mod msvcrt {
             #[link_name = "_commit"]
             fn commit(fd: c_int) -> c_int;
         }

branches/try2/src/libcore/logging.rs

@@ -3,7 +3,7 @@
 export console_on, console_off;
 
 #[nolink]
-native mod rustrt {
+extern mod rustrt {
     fn rust_log_console_on();
     fn rust_log_console_off();
 }

branches/try2/src/libcore/os.rs

@@ -39,7 +39,7 @@ export walk_dir;
 // FIXME: move these to str perhaps? #2620
 export as_c_charp, fill_charp_buf;
 
-native mod rustrt {
+extern mod rustrt {
     fn rust_env_pairs() -> ~[str];
     fn rust_getcwd() -> str;
     fn rust_path_is_dir(path: *libc::c_char) -> c_int;
@@ -135,7 +135,7 @@ mod global_env {
     export getenv;
     export setenv;
 
-    native mod rustrt {
+    extern mod rustrt {
         fn rust_global_env_chan_ptr() -> *libc::uintptr_t;
     }
 

branches/try2/src/libcore/priv.rs

@@ -6,7 +6,7 @@ import compare_and_swap = rustrt::rust_compare_and_swap_ptr;
 
 type rust_port_id = uint;
 
-native mod rustrt {
+extern mod rustrt {
     fn rust_compare_and_swap_ptr(address: *libc::uintptr_t,
                                  oldval: libc::uintptr_t,
                                  newval: libc::uintptr_t) -> bool;

branches/try2/src/libcore/ptr.rs

@@ -19,7 +19,7 @@ import libc::{c_void, size_t};
 
 #[nolink]
 #[abi = "cdecl"]
-native mod libc_ {
+extern mod libc_ {
     #[rust_stack]
     fn memcpy(dest: *c_void, src: *c_void, n: libc::size_t) -> *c_void;
     #[rust_stack]
@@ -29,7 +29,7 @@ native mod libc_ {
 }
 
 #[abi = "rust-intrinsic"]
-native mod rusti {
+extern mod rusti {
     fn addr_of<T>(val: T) -> *T;
 }
 

branches/try2/src/libcore/rand.rs

@@ -6,7 +6,7 @@ export xorshift, seeded_xorshift;
 enum rctx {}
 
 #[abi = "cdecl"]
-native mod rustrt {
+extern mod rustrt {
     fn rand_seed() -> ~[u8];
     fn rand_new() -> *rctx;
     fn rand_new_seeded(seed: ~[u8]) -> *rctx;

branches/try2/src/libcore/run.rs

@@ -10,7 +10,7 @@ export spawn_process;
 export waitpid;
 
 #[abi = "cdecl"]
-native mod rustrt {
+extern mod rustrt {
     fn rust_run_program(argv: **libc::c_char, envp: *c_void,
                         dir: *libc::c_char,
                         in_fd: c_int, out_fd: c_int, err_fd: c_int)

branches/try2/src/libcore/stackwalk.rs

@@ -34,7 +34,7 @@ fn walk_stack(visit: fn(frame) -> bool) {
                 if *frame_address == 0u {
                     #debug("encountered task_start_wrapper. ending walk");
                     // This is the task_start_wrapper_frame. There is
-                    // no stack beneath it and it is a native frame.
+                    // no stack beneath it and it is a foreign frame.
                     break;
                 }
             }
@@ -72,11 +72,11 @@ fn frame_address(f: fn(*u8)) {
     rusti::frame_address(f)
 }
 
-native mod rustrt {
+extern mod rustrt {
     fn rust_dbg_breakpoint();
 }
 
 #[abi = "rust-intrinsic"]
-native mod rusti {
+extern mod rusti {
     fn frame_address(f: fn(*u8));
 }