Removing ccdecl

as per https://github.com/mozilla/rust/pull/9606#discussion_r6930872

diff --git a/src/libextra/time.rs b/src/libextra/time.rs
index a9f3c201b9b59065d7b49a9941806fbc458b5a81..9376e2258975233dab9c768537fb39e04be29335 100644 (file)
--- a/src/libextra/time.rs
+++ b/src/libextra/time.rs
@@ -19,7 +19,7 @@
 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 1f850032266688c73a9129f60e779a3aef495890..cd8c9cd6ab52536ff1df845a4b548d6532f1ceca 100644 (file)
--- a/src/libextra/unicode.rs
+++ b/src/libextra/unicode.rs
@@ -162,7 +162,7 @@ pub mod libicu {
 
         // #[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 6ad379377fcf8f3535f91e9280d4677e7a6ca188..aa899239d8b682ab0b142c7fff918856e4c73874 100644 (file)
--- 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 c3f4de20938f508c4fd9d999d89cb040b5649ee7..7160496f4abadeddca2b2555498c00d36a3029fb 100644 (file)
--- 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 67df68df6e461d0c5c0322e91de487f82d5cdc3f..3313823fc5f5dd551d01a1803a0723b6970533c2 100644 (file)
--- a/src/libstd/libc.rs
+++ b/src/libstd/libc.rs
@@ -2666,7 +2666,7 @@ pub mod c95 {
         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 stdio {
             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 stdlib {
             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 string {
             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 stat_ {
             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 stdio {
             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 stdio {
         #[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 unistd {
                                              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 stat_ {
             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 stdio {
             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 fcntl {
             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 unsafe fn readdir(dirp: *DIR) -> *dirent_t {
                 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 unistd {
             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 signal {
             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 mman {
             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 stat_ {
             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 unistd {
             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 wait {
             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 glob {
             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<extern "C" fn(epath: *c_char, errno: int) -> int>,
@@ -3207,7 +3207,7 @@ pub mod mman {
             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 bsd44 {
         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 bsd44 {
         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 bsd44 {
     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 msvcrt {
             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 aed3601060b74084d1b5be53e5bae010d05e2cf7..72051a933980e610eca725ca54a1edab570455f6 100644 (file)
--- 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 987648ca6f2e7e4b7e5c65884265a3dc996494c3..ca9c6eb79f98eb37c77e3af2b03073759da04cb9 100644 (file)
--- 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 f6dca262d4c12126b8bada14e270a88a5096366f..38c1a32b12e4aefeab44fa775c936fa65bed23b2 100644 (file)
--- 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 ef951de6c4df5e6d1c58efd48c910a7f1d9f9679..343e9b9b8ad1f103018198a25b0650b2ae5304cb 100644 (file)
--- 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 9a38702efbd58bb4481d49de6557a420bc9621e8..f8d30a9a6672f2e056266590f464978cb4117727 100644 (file)
--- 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 7d7f0fc23fec9db1d7fe1362aacd005fb39dde3f..866dd6b67053dfb583f211a58f3e2fa359b89d21 100644 (file)
--- 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 dc10a0bbd7799249bb45daa30cdb03c59b4c0198..89f4440f5bb33056e51bcad98a173402662024c7 100644 (file)
--- a/src/test/run-pass/conditional-compile.rs
+++ b/src/test/run-pass/conditional-compile.rs
@@ -21,13 +21,13 @@
 
 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 f() { }
 
 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 793898058a1602f49c5ce22ea8cd54f5bbbc8624..9f1ca435c739cecc43340375485624d1511655ed 100644 (file)
--- 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 d037feab452db36004d0424495173fe5a893d08b..3c6d33c637cdfe5540dba4d38ca07dc8880b6a32 100644 (file)
--- 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 654b3b7d43aaa8d747b7f101b162b517cf3bbc3e..350a3d6f4fc296baa97513cff68983deff31db00 100644 (file)
--- 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 298c4e7454d5f866db7d34b83955b7e782140861..9eebf662843836b794c0a095714be6d6b7850d7f 100644 (file)
--- 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 0266f6ea93054b57661ca05560e86aef862c0490..22f0f1f199f2ccc3bd592dad636dc79804ac9739 100644 (file)
--- a/src/test/run-pass/item-attributes.rs
+++ b/src/test/run-pass/item-attributes.rs
@@ -39,7 +39,7 @@ pub mod mod1 {}
 
     pub mod rustrt {
         #[attr = "val"]
-        extern "cdecl" {}
+        extern {}
     }
 }
 
@@ -59,7 +59,7 @@ pub mod mod1 {}
     pub mod rustrt {
         #[attr1 = "val"]
         #[attr2 = "val"]
-        extern "cdecl" {}
+        extern {}
     }
 
     #[attr1 = "val"]
@@ -81,7 +81,7 @@ mod mod1 {
 
         mod rustrt {
             #[attr = "val"]
-            extern "cdecl" {
+            extern {
             }
         }
     }
@@ -107,7 +107,7 @@ mod mod1 {
         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]