---

yaml
---
r: 83885
b: refs/heads/try
c: b571039
h: refs/heads/master
i:
  83883: 74df6ab
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: 309ab958e6cf78caf188f6dcbf9ce35d9ba62468
+refs/heads/try: b571039021e031888cea4e0b53d8f9b4e81c6d31
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/doc/tutorial-ffi.md

@@ -415,18 +415,21 @@ fn main() {
 
 Most foreign code exposes a C ABI, and Rust uses the platform's C calling convention by default when
 calling foreign functions. Some foreign functions, most notably the Windows API, use other calling
-conventions. Rust provides a way to tell the compiler which convention to use:
+conventions. Rust provides the `abi` attribute as a way to hint to the compiler which calling
+convention to use:
 
 ~~~~
 #[cfg(target_os = "win32")]
+#[abi = "stdcall"]
 #[link_name = "kernel32"]
-extern "stdcall" {
+extern {
     fn SetEnvironmentVariableA(n: *u8, v: *u8) -> int;
 }
 ~~~~
 
-This applies to the entire `extern` block, and must be either `"cdecl"` or
-`"stdcall"`. The compiler may eventually support other calling conventions.
+The `abi` attribute applies to a foreign module (it cannot be applied to a single function within a
+module), and must be either `"cdecl"` or `"stdcall"`. The compiler may eventually support other
+calling conventions.
 
 # Interoperability with foreign code
 

branches/try/src/libextra/time.rs

@@ -19,6 +19,7 @@ static NSEC_PER_SEC: i32 = 1_000_000_000_i32;
 pub mod rustrt {
     use super::Tm;
 
+    #[abi = "cdecl"]
     extern {
         pub fn get_time(sec: &mut i64, nsec: &mut i32);
         pub fn precise_time_ns(ns: &mut u64);

branches/try/src/libextra/unicode.rs

@@ -162,6 +162,7 @@ pub mod icu {
 
         // #[link_name = "icuuc"]
         #[link_args = "-licuuc"]
+        #[abi = "cdecl"]
         extern {
             pub fn u_hasBinaryProperty(c: UChar32, which: UProperty) -> UBool;
             pub fn u_isdigit(c: UChar32) -> UBool;

branches/try/src/librustc/lib/llvm.rs

@@ -300,6 +300,7 @@ pub mod llvm {
 
     #[link_args = "-Lrustllvm -lrustllvm"]
     #[link_name = "rustllvm"]
+    #[abi = "cdecl"]
     extern {
         /* Create and destroy contexts. */
         pub fn LLVMContextCreate() -> ContextRef;

branches/try/src/libstd/io.rs

@@ -76,6 +76,7 @@ pub type fd_t = c_int;
 pub mod rustrt {
     use libc;
 
+    #[abi = "cdecl"]
     #[link_name = "rustrt"]
     extern {
         pub fn rust_get_stdin() -> *libc::FILE;

branches/try/src/libstd/libc.rs

@@ -2663,6 +2663,7 @@ pub mod funcs {
 
     pub mod c95 {
         #[nolink]
+        #[abi = "cdecl"]
         pub mod ctype {
             use libc::types::os::arch::c95::{c_char, c_int};
 
@@ -2684,6 +2685,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         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};
@@ -2740,6 +2742,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod stdlib {
             use libc::types::common::c95::c_void;
             use libc::types::os::arch::c95::{c_char, c_double, c_int};
@@ -2773,6 +2776,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod string {
             use libc::types::common::c95::c_void;
             use libc::types::os::arch::c95::{c_char, c_int, size_t};
@@ -2822,6 +2826,7 @@ pub mod funcs {
     #[cfg(target_os = "win32")]
     pub mod posix88 {
         #[nolink]
+        #[abi = "cdecl"]
         pub mod stat_ {
             use libc::types::os::common::posix01::stat;
             use libc::types::os::arch::c95::{c_int, c_char};
@@ -2839,6 +2844,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod stdio {
             use libc::types::common::c95::FILE;
             use libc::types::os::arch::c95::{c_int, c_char};
@@ -2856,6 +2862,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod fcntl {
             use libc::types::os::arch::c95::{c_int, c_char};
             extern {
@@ -2868,11 +2875,13 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod dirent {
             // Not supplied at all.
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod unistd {
             use libc::types::common::c95::c_void;
             use libc::types::os::arch::c95::{c_int, c_uint, c_char,
@@ -2940,6 +2949,7 @@ pub mod funcs {
             use libc::types::os::arch::posix88::mode_t;
 
             #[nolink]
+            #[abi = "cdecl"]
             extern {
                 pub fn chmod(path: *c_char, mode: mode_t) -> c_int;
                 pub fn fchmod(fd: c_int, mode: mode_t) -> c_int;
@@ -2968,6 +2978,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod stdio {
             use libc::types::common::c95::FILE;
             use libc::types::os::arch::c95::{c_char, c_int};
@@ -2981,6 +2992,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod fcntl {
             use libc::types::os::arch::c95::{c_char, c_int};
             use libc::types::os::arch::posix88::mode_t;
@@ -2994,6 +3006,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod dirent {
             use libc::types::common::posix88::{DIR, dirent_t};
             use libc::types::os::arch::c95::{c_char, c_int, c_long};
@@ -3027,6 +3040,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod unistd {
             use libc::types::common::c95::c_void;
             use libc::types::os::arch::c95::{c_char, c_int, c_long, c_uint};
@@ -3086,6 +3100,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod signal {
             use libc::types::os::arch::c95::{c_int};
             use libc::types::os::arch::posix88::{pid_t};
@@ -3096,6 +3111,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod mman {
             use libc::types::common::c95::{c_void};
             use libc::types::os::arch::c95::{size_t, c_int, c_char};
@@ -3134,6 +3150,7 @@ pub mod funcs {
     #[cfg(target_os = "freebsd")]
     pub mod posix01 {
         #[nolink]
+        #[abi = "cdecl"]
         pub mod stat_ {
             use libc::types::os::arch::c95::{c_char, c_int};
             use libc::types::os::arch::posix01::stat;
@@ -3151,6 +3168,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod unistd {
             use libc::types::os::arch::c95::{c_char, c_int, size_t};
             use libc::types::os::arch::posix88::{ssize_t};
@@ -3177,6 +3195,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod wait {
             use libc::types::os::arch::c95::{c_int};
             use libc::types::os::arch::posix88::{pid_t};
@@ -3188,6 +3207,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod glob {
             use libc::types::os::arch::c95::{c_char, c_int};
             use libc::types::os::common::posix01::{glob_t};
@@ -3203,6 +3223,7 @@ pub mod funcs {
         }
 
         #[nolink]
+        #[abi = "cdecl"]
         pub mod mman {
             use libc::types::common::c95::{c_void};
             use libc::types::os::arch::c95::{c_int, size_t};
@@ -3250,6 +3271,7 @@ pub mod funcs {
         use libc::types::os::arch::c95::{c_char, c_uchar, c_int, c_uint,
                                          size_t};
 
+        #[abi = "cdecl"]
         extern {
             pub fn sysctl(name: *c_int,
                           namelen: c_uint,
@@ -3283,6 +3305,7 @@ pub mod funcs {
         use libc::types::common::c95::{c_void};
         use libc::types::os::arch::c95::{c_uchar, c_int, size_t};
 
+        #[abi = "cdecl"]
         extern {
             pub fn getdtablesize() -> c_int;
             pub fn madvise(addr: *c_void, len: size_t, advice: c_int)
@@ -3302,6 +3325,7 @@ pub mod funcs {
     pub mod extra {
         use libc::types::os::arch::c95::{c_char, c_int};
 
+        #[abi = "cdecl"]
         extern {
             pub fn _NSGetExecutablePath(buf: *mut c_char, bufsize: *mut u32)
                                         -> c_int;
@@ -3334,6 +3358,7 @@ pub mod funcs {
             use libc::types::os::arch::extra::{HANDLE, LPHANDLE};
 
             #[cfg(target_arch = "x86")]
+            #[abi = "stdcall"]
             extern "stdcall" {
                 pub fn GetEnvironmentVariableW(n: LPCWSTR,
                                                v: LPWSTR,
@@ -3547,6 +3572,7 @@ pub mod funcs {
         pub mod msvcrt {
             use libc::types::os::arch::c95::{c_int, c_long};
 
+            #[abi = "cdecl"]
             #[nolink]
             extern {
                 #[link_name = "_commit"]

branches/try/src/libstd/num/cmath.rs

@@ -18,6 +18,7 @@ pub mod c_double_utils {
     use libc::{c_double, c_int};
 
     #[link_name = "m"]
+    #[abi = "cdecl"]
     extern {
         // Alpabetically sorted by link_name
 
@@ -106,6 +107,7 @@ pub mod c_float_utils {
     use libc::{c_float, c_int};
 
     #[link_name = "m"]
+    #[abi = "cdecl"]
     extern {
         // Alpabetically sorted by link_name
 

branches/try/src/libstd/os.rs

@@ -1039,6 +1039,7 @@ pub fn errno() -> uint {
 
     #[cfg(target_arch = "x86")]
     #[link_name = "kernel32"]
+    #[abi = "stdcall"]
     extern "stdcall" {
         fn GetLastError() -> DWORD;
     }
@@ -1117,6 +1118,7 @@ pub fn last_os_error() -> ~str {
 
         #[cfg(target_arch = "x86")]
         #[link_name = "kernel32"]
+        #[abi = "stdcall"]
         extern "stdcall" {
             fn FormatMessageW(flags: DWORD,
                               lpSrc: LPVOID,

branches/try/src/libstd/rt/thread_local_storage.rs

@@ -84,6 +84,7 @@ pub unsafe fn get(key: Key) -> *mut c_void {
 }
 
 #[cfg(windows, target_arch = "x86")]
+#[abi = "stdcall"]
 extern "stdcall" {
        fn TlsAlloc() -> DWORD;
        fn TlsSetValue(dwTlsIndex: DWORD, lpTlsvalue: LPVOID) -> BOOL;

branches/try/src/libstd/unstable/intrinsics.rs

@@ -170,6 +170,7 @@ pub trait TyVisitor {
     fn visit_closure_ptr(&mut self, ck: uint) -> bool;
 }
 
+#[abi = "rust-intrinsic"]
 extern "rust-intrinsic" {
 
     /// Atomic compare and exchange, sequentially consistent.