diff --git a/src/libextra/time.rs b/src/libextra/time.rs index a9f3c201b9b..9376e225897 100644 --- a/src/libextra/time.rs +++ b/src/libextra/time.rs @@ -19,7 +19,7 @@ static NSEC_PER_SEC: i32 = 1_000_000_000_i32; pub mod rustrt { use super::Tm; - extern "cdecl" { + extern { pub fn get_time(sec: &mut i64, nsec: &mut i32); pub fn precise_time_ns(ns: &mut u64); pub fn rust_tzset(); diff --git a/src/libextra/unicode.rs b/src/libextra/unicode.rs index 1f850032266..cd8c9cd6ab5 100644 --- a/src/libextra/unicode.rs +++ b/src/libextra/unicode.rs @@ -162,7 +162,7 @@ pub mod icu { // #[link_name = "icuuc"] #[link_args = "-licuuc"] - extern "cdecl" { + extern { pub fn u_hasBinaryProperty(c: UChar32, which: UProperty) -> UBool; pub fn u_isdigit(c: UChar32) -> UBool; pub fn u_islower(c: UChar32) -> UBool; diff --git a/src/librustc/lib/llvm.rs b/src/librustc/lib/llvm.rs index 6ad379377fc..aa899239d8b 100644 --- a/src/librustc/lib/llvm.rs +++ b/src/librustc/lib/llvm.rs @@ -300,7 +300,7 @@ pub mod llvm { #[link_args = "-Lrustllvm -lrustllvm"] #[link_name = "rustllvm"] - extern "cdecl" { + extern { /* Create and destroy contexts. */ pub fn LLVMContextCreate() -> ContextRef; pub fn LLVMContextDispose(C: ContextRef); diff --git a/src/libstd/io.rs b/src/libstd/io.rs index c3f4de20938..7160496f4ab 100644 --- a/src/libstd/io.rs +++ b/src/libstd/io.rs @@ -77,7 +77,7 @@ pub mod rustrt { use libc; #[link_name = "rustrt"] - extern "cdecl" { + extern { pub fn rust_get_stdin() -> *libc::FILE; pub fn rust_get_stdout() -> *libc::FILE; pub fn rust_get_stderr() -> *libc::FILE; diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs index 67df68df6e4..3313823fc5f 100644 --- a/src/libstd/libc.rs +++ b/src/libstd/libc.rs @@ -2666,7 +2666,7 @@ pub mod funcs { pub mod ctype { use libc::types::os::arch::c95::{c_char, c_int}; - extern "cdecl" { + extern { pub fn isalnum(c: c_int) -> c_int; pub fn isalpha(c: c_int) -> c_int; pub fn iscntrl(c: c_int) -> c_int; @@ -2688,7 +2688,7 @@ pub mod funcs { use libc::types::common::c95::{FILE, c_void, fpos_t}; use libc::types::os::arch::c95::{c_char, c_int, c_long, size_t}; - extern "cdecl" { + extern { pub fn fopen(filename: *c_char, mode: *c_char) -> *FILE; pub fn freopen(filename: *c_char, mode: *c_char, file: *FILE) -> *FILE; @@ -2746,7 +2746,7 @@ pub mod funcs { use libc::types::os::arch::c95::{c_long, c_uint, c_ulong}; use libc::types::os::arch::c95::{size_t}; - extern "cdecl" { + extern { pub fn abs(i: c_int) -> c_int; pub fn labs(i: c_long) -> c_long; // Omitted: div, ldiv (return pub type incomplete). @@ -2778,7 +2778,7 @@ pub mod funcs { use libc::types::os::arch::c95::{c_char, c_int, size_t}; use libc::types::os::arch::c95::{wchar_t}; - extern "cdecl" { + extern { pub fn strcpy(dst: *c_char, src: *c_char) -> *c_char; pub fn strncpy(dst: *c_char, src: *c_char, n: size_t) -> *c_char; @@ -2826,7 +2826,7 @@ pub mod funcs { use libc::types::os::common::posix01::stat; use libc::types::os::arch::c95::{c_int, c_char}; - extern "cdecl" { + extern { #[link_name = "_chmod"] pub fn chmod(path: *c_char, mode: c_int) -> c_int; #[link_name = "_mkdir"] @@ -2843,7 +2843,7 @@ pub mod funcs { use libc::types::common::c95::FILE; use libc::types::os::arch::c95::{c_int, c_char}; - extern "cdecl" { + extern { #[link_name = "_popen"] pub fn popen(command: *c_char, mode: *c_char) -> *FILE; #[link_name = "_pclose"] @@ -2858,7 +2858,7 @@ pub mod funcs { #[nolink] pub mod fcntl { use libc::types::os::arch::c95::{c_int, c_char}; - extern "cdecl" { + extern { #[link_name = "_open"] pub fn open(path: *c_char, oflag: c_int, mode: c_int) -> c_int; @@ -2879,7 +2879,7 @@ pub mod funcs { c_long, size_t}; use libc::types::os::arch::c99::intptr_t; - extern "cdecl" { + extern { #[link_name = "_access"] pub fn access(path: *c_char, amode: c_int) -> c_int; #[link_name = "_chdir"] @@ -2940,7 +2940,7 @@ pub mod funcs { use libc::types::os::arch::posix88::mode_t; #[nolink] - extern "cdecl" { + extern { pub fn chmod(path: *c_char, mode: mode_t) -> c_int; pub fn fchmod(fd: c_int, mode: mode_t) -> c_int; @@ -2972,7 +2972,7 @@ pub mod funcs { use libc::types::common::c95::FILE; use libc::types::os::arch::c95::{c_char, c_int}; - extern "cdecl" { + extern { pub fn popen(command: *c_char, mode: *c_char) -> *FILE; pub fn pclose(stream: *FILE) -> c_int; pub fn fdopen(fd: c_int, mode: *c_char) -> *FILE; @@ -2985,7 +2985,7 @@ pub mod funcs { use libc::types::os::arch::c95::{c_char, c_int}; use libc::types::os::arch::posix88::mode_t; - extern "cdecl" { + extern { pub fn open(path: *c_char, oflag: c_int, mode: c_int) -> c_int; pub fn creat(path: *c_char, mode: mode_t) -> c_int; @@ -3013,12 +3013,12 @@ pub mod funcs { rust_readdir(dirp) } - extern "cdecl" { + extern { fn rust_opendir(dirname: *c_char) -> *DIR; fn rust_readdir(dirp: *DIR) -> *dirent_t; } - extern "cdecl" { + extern { pub fn closedir(dirp: *DIR) -> c_int; pub fn rewinddir(dirp: *DIR); pub fn seekdir(dirp: *DIR, loc: c_long); @@ -3034,7 +3034,7 @@ pub mod funcs { use libc::types::os::arch::posix88::{gid_t, off_t, pid_t}; use libc::types::os::arch::posix88::{ssize_t, uid_t}; - extern "cdecl" { + extern { pub fn access(path: *c_char, amode: c_int) -> c_int; pub fn alarm(seconds: c_uint) -> c_uint; pub fn chdir(dir: *c_char) -> c_int; @@ -3090,7 +3090,7 @@ pub mod funcs { use libc::types::os::arch::c95::{c_int}; use libc::types::os::arch::posix88::{pid_t}; - extern "cdecl" { + extern { pub fn kill(pid: pid_t, sig: c_int) -> c_int; } } @@ -3101,7 +3101,7 @@ pub mod funcs { use libc::types::os::arch::c95::{size_t, c_int, c_char}; use libc::types::os::arch::posix88::{mode_t, off_t}; - extern "cdecl" { + extern { pub fn mlock(addr: *c_void, len: size_t) -> c_int; pub fn munlock(addr: *c_void, len: size_t) -> c_int; pub fn mlockall(flags: c_int) -> c_int; @@ -3138,7 +3138,7 @@ pub mod funcs { use libc::types::os::arch::c95::{c_char, c_int}; use libc::types::os::arch::posix01::stat; - extern "cdecl" { + extern { #[cfg(target_os = "linux")] #[cfg(target_os = "freebsd")] #[cfg(target_os = "android")] @@ -3155,7 +3155,7 @@ pub mod funcs { use libc::types::os::arch::c95::{c_char, c_int, size_t}; use libc::types::os::arch::posix88::{ssize_t}; - extern "cdecl" { + extern { pub fn readlink(path: *c_char, buf: *mut c_char, bufsz: size_t) @@ -3181,7 +3181,7 @@ pub mod funcs { use libc::types::os::arch::c95::{c_int}; use libc::types::os::arch::posix88::{pid_t}; - extern "cdecl" { + extern { pub fn waitpid(pid: pid_t, status: *mut c_int, options: c_int) -> pid_t; } @@ -3193,7 +3193,7 @@ pub mod funcs { use libc::types::os::common::posix01::{glob_t}; use option::Option; - extern "cdecl" { + extern { pub fn glob(pattern: *c_char, flags: c_int, errfunc: Option int>, @@ -3207,7 +3207,7 @@ pub mod funcs { use libc::types::common::c95::{c_void}; use libc::types::os::arch::c95::{c_int, size_t}; - extern "cdecl" { + extern { pub fn posix_madvise(addr: *c_void, len: size_t, advice: c_int) @@ -3250,7 +3250,7 @@ pub mod funcs { use libc::types::os::arch::c95::{c_char, c_uchar, c_int, c_uint, size_t}; - extern "cdecl" { + extern { pub fn sysctl(name: *c_int, namelen: c_uint, oldp: *mut c_void, @@ -3283,7 +3283,7 @@ pub mod funcs { use libc::types::common::c95::{c_void}; use libc::types::os::arch::c95::{c_uchar, c_int, size_t}; - extern "cdecl" { + extern { pub fn getdtablesize() -> c_int; pub fn madvise(addr: *c_void, len: size_t, advice: c_int) -> c_int; @@ -3302,7 +3302,7 @@ pub mod funcs { pub mod extra { use libc::types::os::arch::c95::{c_char, c_int}; - extern "cdecl" { + extern { pub fn _NSGetExecutablePath(buf: *mut c_char, bufsize: *mut u32) -> c_int; } @@ -3548,7 +3548,7 @@ pub mod funcs { use libc::types::os::arch::c95::{c_int, c_long}; #[nolink] - extern "cdecl" { + extern { #[link_name = "_commit"] pub fn commit(fd: c_int) -> c_int; diff --git a/src/libstd/num/cmath.rs b/src/libstd/num/cmath.rs index aed3601060b..72051a93398 100644 --- a/src/libstd/num/cmath.rs +++ b/src/libstd/num/cmath.rs @@ -18,7 +18,7 @@ pub mod c_double_utils { use libc::{c_double, c_int}; #[link_name = "m"] - extern "cdecl" { + extern { // Alpabetically sorted by link_name pub fn acos(n: c_double) -> c_double; @@ -106,7 +106,7 @@ pub mod c_float_utils { use libc::{c_float, c_int}; #[link_name = "m"] - extern "cdecl" { + extern { // Alpabetically sorted by link_name #[link_name="acosf"] diff --git a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs index 987648ca6f2..ca9c6eb79f9 100644 --- a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs +++ b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs @@ -16,6 +16,6 @@ use std::libc; -extern "cdecl" { +extern { pub fn rust_get_test_int() -> libc::intptr_t; } diff --git a/src/test/compile-fail/foreign-unsafe-fn-called.rs b/src/test/compile-fail/foreign-unsafe-fn-called.rs index f6dca262d4c..38c1a32b12e 100644 --- a/src/test/compile-fail/foreign-unsafe-fn-called.rs +++ b/src/test/compile-fail/foreign-unsafe-fn-called.rs @@ -11,7 +11,7 @@ mod test { - extern "cdecl" { + extern { pub fn free(); } } diff --git a/src/test/run-pass/anon-extern-mod.rs b/src/test/run-pass/anon-extern-mod.rs index ef951de6c4d..343e9b9b8ad 100644 --- a/src/test/run-pass/anon-extern-mod.rs +++ b/src/test/run-pass/anon-extern-mod.rs @@ -11,7 +11,7 @@ use std::libc; #[link_name = "rustrt"] -extern "cdecl" { +extern { fn rust_get_test_int() -> libc::intptr_t; } diff --git a/src/test/run-pass/c-stack-as-value.rs b/src/test/run-pass/c-stack-as-value.rs index 9a38702efbd..f8d30a9a667 100644 --- a/src/test/run-pass/c-stack-as-value.rs +++ b/src/test/run-pass/c-stack-as-value.rs @@ -11,7 +11,7 @@ mod rustrt { use std::libc; - extern "cdecl" { + extern { pub fn rust_get_test_int() -> libc::intptr_t; } } diff --git a/src/test/run-pass/c-stack-returning-int64.rs b/src/test/run-pass/c-stack-returning-int64.rs index 7d7f0fc23fe..866dd6b6705 100644 --- a/src/test/run-pass/c-stack-returning-int64.rs +++ b/src/test/run-pass/c-stack-returning-int64.rs @@ -12,7 +12,7 @@ mod libc { use std::libc::{c_char, c_long, c_longlong}; #[nolink] - extern "cdecl" { + extern { pub fn atol(x: *c_char) -> c_long; pub fn atoll(x: *c_char) -> c_longlong; } diff --git a/src/test/run-pass/conditional-compile.rs b/src/test/run-pass/conditional-compile.rs index dc10a0bbd77..89f4440f5bb 100644 --- a/src/test/run-pass/conditional-compile.rs +++ b/src/test/run-pass/conditional-compile.rs @@ -21,13 +21,13 @@ static b: bool = true; mod rustrt { #[cfg(bogus)] - extern "cdecl" { + extern { // This symbol doesn't exist and would be a link error if this // module was translated pub fn bogus(); } - extern "cdecl" {} + extern {} } #[cfg(bogus)] @@ -107,7 +107,7 @@ fn test_in_fn_ctxt() { mod test_foreign_items { pub mod rustrt { - extern "cdecl" { + extern { #[cfg(bogus)] pub fn rust_get_stdin() -> ~str; pub fn rust_get_stdin() -> ~str; diff --git a/src/test/run-pass/foreign-dupe.rs b/src/test/run-pass/foreign-dupe.rs index 793898058a1..9f1ca435c73 100644 --- a/src/test/run-pass/foreign-dupe.rs +++ b/src/test/run-pass/foreign-dupe.rs @@ -15,7 +15,7 @@ mod rustrt1 { use std::libc; #[link_name = "rustrt"] - extern "cdecl" { + extern { pub fn rust_get_test_int() -> libc::intptr_t; } } @@ -24,7 +24,7 @@ mod rustrt2 { use std::libc; #[link_name = "rustrt"] - extern "cdecl" { + extern { pub fn rust_get_test_int() -> libc::intptr_t; } } diff --git a/src/test/run-pass/foreign-fn-linkname.rs b/src/test/run-pass/foreign-fn-linkname.rs index d037feab452..3c6d33c637c 100644 --- a/src/test/run-pass/foreign-fn-linkname.rs +++ b/src/test/run-pass/foreign-fn-linkname.rs @@ -14,7 +14,7 @@ mod libc { use std::libc::{c_char, size_t}; #[nolink] - extern "cdecl" { + extern { #[link_name = "strlen"] pub fn my_strlen(str: *c_char) -> size_t; } diff --git a/src/test/run-pass/foreign2.rs b/src/test/run-pass/foreign2.rs index 654b3b7d43a..350a3d6f4fc 100644 --- a/src/test/run-pass/foreign2.rs +++ b/src/test/run-pass/foreign2.rs @@ -10,26 +10,26 @@ mod bar { #[nolink] - extern "cdecl" {} + extern {} } mod zed { #[nolink] - extern "cdecl" {} + extern {} } mod libc { use std::libc::{c_int, c_void, size_t, ssize_t}; #[nolink] - extern "cdecl" { + extern { pub fn write(fd: c_int, buf: *c_void, count: size_t) -> ssize_t; } } mod baz { #[nolink] - extern "cdecl" {} + extern {} } pub fn main() { } diff --git a/src/test/run-pass/issue-2214.rs b/src/test/run-pass/issue-2214.rs index 298c4e7454d..9eebf662843 100644 --- a/src/test/run-pass/issue-2214.rs +++ b/src/test/run-pass/issue-2214.rs @@ -30,7 +30,7 @@ mod m { use std::libc::{c_double, c_int}; #[link_name = "m"] - extern "cdecl" { + extern { #[cfg(unix)] #[link_name="lgamma_r"] pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double; diff --git a/src/test/run-pass/item-attributes.rs b/src/test/run-pass/item-attributes.rs index 0266f6ea930..22f0f1f199f 100644 --- a/src/test/run-pass/item-attributes.rs +++ b/src/test/run-pass/item-attributes.rs @@ -39,7 +39,7 @@ mod test_single_attr_outer { pub mod rustrt { #[attr = "val"] - extern "cdecl" {} + extern {} } } @@ -59,7 +59,7 @@ mod test_multi_attr_outer { pub mod rustrt { #[attr1 = "val"] #[attr2 = "val"] - extern "cdecl" {} + extern {} } #[attr1 = "val"] @@ -81,7 +81,7 @@ mod test_stmt_single_attr_outer { mod rustrt { #[attr = "val"] - extern "cdecl" { + extern { } } } @@ -107,7 +107,7 @@ mod test_stmt_multi_attr_outer { pub mod rustrt { #[attr1 = "val"] #[attr2 = "val"] - extern "cdecl" { + extern { } } */ @@ -165,7 +165,7 @@ mod test_foreign_items { pub mod rustrt { use std::libc; - extern "cdecl" { + extern { #[attr]; #[attr]