Skip to content

Commit b7ab28b

Browse files
committed
Rename "c-stack-cdecl" ABI to "cdecl"
1 parent 2b9b6e3 commit b7ab28b

23 files changed

+25
-27
lines changed

src/comp/lib/llvm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const LLVMRealULE: uint = 13u;
112112
const LLVMRealUNE: uint = 14u;
113113

114114
#[link_args = "-Lrustllvm"]
115-
native "c-stack-cdecl" mod llvm = "rustllvm" {
115+
native "cdecl" mod llvm = "rustllvm" {
116116

117117
type ModuleRef;
118118
type ContextRef;

src/comp/syntax/parse/parser.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2008,8 +2008,6 @@ fn parse_item_native_mod(p: parser, attrs: [ast::attribute]) -> @ast::item {
20082008
let t = parse_str(p);
20092009
if str::eq(t, "rust-intrinsic") {
20102010
abi = ast::native_abi_rust_intrinsic;
2011-
} else if str::eq(t, "c-stack-cdecl") {
2012-
abi = ast::native_abi_cdecl;
20132011
} else if str::eq(t, "cdecl") {
20142012
abi = ast::native_abi_cdecl;
20152013
} else if str::eq(t, "c-stack-stdcall") {

src/lib/aio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import comm;
55
import comm::{chan, port, send, recv};
66
import net;
77

8-
native "c-stack-cdecl" mod rustrt {
8+
native "cdecl" mod rustrt {
99
type socket;
1010
type server;
1111
fn aio_init();

src/lib/comm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export recv;
3737
export chan;
3838
export port;
3939

40-
native "c-stack-cdecl" mod rustrt {
40+
native "cdecl" mod rustrt {
4141
type void;
4242
type rust_port;
4343

src/lib/dbg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* logging.
99
*/
1010

11-
native "c-stack-cdecl" mod rustrt {
11+
native "cdecl" mod rustrt {
1212
fn debug_tydesc(td: *sys::type_desc);
1313
fn debug_opaque<T>(td: *sys::type_desc, x: T);
1414
fn debug_box<T>(td: *sys::type_desc, x: @T);

src/lib/fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ File system manipulation
77
import os::getcwd;
88
import os_fs;
99

10-
native "c-stack-cdecl" mod rustrt {
10+
native "cdecl" mod rustrt {
1111
fn rust_file_is_dir(path: str::sbuf) -> int;
1212
}
1313

src/lib/io.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os::libc;
22

3-
native "c-stack-cdecl" mod rustrt {
3+
native "cdecl" mod rustrt {
44
fn rust_get_stdin() -> os::libc::FILE;
55
fn rust_get_stdout() -> os::libc::FILE;
66
fn rust_get_stderr() -> os::libc::FILE;

src/lib/linux_os.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ TODO: Restructure and document
66

77
// FIXME Somehow merge stuff duplicated here and macosx_os.rs. Made difficult
88
// by https://github.com/graydon/rust/issues#issue/268
9-
native "c-stack-cdecl" mod libc = "" {
9+
native "cdecl" mod libc = "" {
1010
fn read(fd: int, buf: *u8, count: uint) -> int;
1111
fn write(fd: int, buf: *u8, count: uint) -> int;
1212
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
@@ -86,7 +86,7 @@ fn waitpid(pid: int) -> int {
8686
ret status;
8787
}
8888

89-
native "c-stack-cdecl" mod rustrt {
89+
native "cdecl" mod rustrt {
9090
fn rust_getcwd() -> str;
9191
}
9292

src/lib/macos_os.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
native "c-stack-cdecl" mod libc = "" {
2+
native "cdecl" mod libc = "" {
33
fn read(fd: int, buf: *u8, count: uint) -> int;
44
fn write(fd: int, buf: *u8, count: uint) -> int;
55
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
@@ -79,7 +79,7 @@ fn waitpid(pid: int) -> int {
7979
ret status;
8080
}
8181

82-
native "c-stack-cdecl" mod rustrt {
82+
native "cdecl" mod rustrt {
8383
fn rust_getcwd() -> str;
8484
}
8585

src/lib/math.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Module: math */
22

3-
native "c-stack-cdecl" mod libc = "" {
3+
native "cdecl" mod libc = "" {
44
fn sqrt(n: float) -> float;
55
fn sin(n: float) -> float;
66
fn asin(n: float) -> float;

src/lib/posix_fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
native "c-stack-cdecl" mod rustrt {
1+
native "cdecl" mod rustrt {
22
fn rust_list_files(path: str) -> [str];
33
}
44

src/lib/rand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Module: rand
33
44
Random number generation
55
*/
6-
native "c-stack-cdecl" mod rustrt {
6+
native "cdecl" mod rustrt {
77
type rctx;
88
fn rand_new() -> rctx;
99
fn rand_next(c: rctx) -> u32;

src/lib/run_program.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export program_output;
1212
export spawn_process;
1313
export waitpid;
1414

15-
native "c-stack-cdecl" mod rustrt {
15+
native "cdecl" mod rustrt {
1616
fn rust_run_program(argv: *sbuf, in_fd: int, out_fd: int, err_fd: int) ->
1717
int;
1818
}

src/lib/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export eq, lteq, hash, is_empty, is_not_empty, is_whitespace, byte_len,
1515
str_from_cstr, sbuf, as_buf, push_byte, utf8_char_width, safe_slice,
1616
contains, iter_chars, loop_chars, loop_chars_sub;
1717

18-
native "c-stack-cdecl" mod rustrt {
18+
native "cdecl" mod rustrt {
1919
fn rust_str_push(&s: str, ch: u8);
2020
}
2121

src/lib/sys.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tag type_desc {
77
type_desc(@type_desc);
88
}
99

10-
native "c-stack-cdecl" mod rustrt {
10+
native "cdecl" mod rustrt {
1111
// Explicitly re-export native stuff we want to be made
1212
// available outside this crate. Otherwise it's
1313
// visible-in-crate, but not re-exported.

src/lib/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ native "rust-intrinsic" mod rusti {
5555
fn task_sleep(time_in_us: uint);
5656
}
5757

58-
native "c-stack-cdecl" mod rustrt = "rustrt" {
58+
native "cdecl" mod rustrt = "rustrt" {
5959
// these can run on the C stack:
6060
fn pin_task();
6161
fn unpin_task();

src/lib/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default_test_to_task;
2626
export configure_test_task;
2727
export joinable;
2828

29-
native "c-stack-cdecl" mod rustrt {
29+
native "cdecl" mod rustrt {
3030
fn sched_threads() -> uint;
3131
}
3232

src/lib/time.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Module: time
44

55
// FIXME: Document what these functions do
66

7-
native "c-stack-cdecl" mod rustrt {
7+
native "cdecl" mod rustrt {
88
fn get_time(&sec: u32, &usec: u32);
99
fn nano_time(&ns: u64);
1010
}

src/lib/unicode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ mod icu {
148148
// FIXME: should be -1, change when compiler supports negative
149149
// constants
150150

151-
native "c-stack-cdecl" mod libicu = "icuuc" {
151+
native "cdecl" mod libicu = "icuuc" {
152152
fn u_hasBinaryProperty(c: UChar32, which: UProperty) -> UBool;
153153
}
154154
}

src/lib/unsafe.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ native "rust-intrinsic" mod rusti {
88
fn cast<T, U>(src: T) -> U;
99
}
1010

11-
native "c-stack-cdecl" mod rustrt {
11+
native "cdecl" mod rustrt {
1212
fn leak<T>(-thing: T);
1313
}
1414

src/lib/vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ native "rust-intrinsic" mod rusti {
1010
fn vec_len<T>(&&v: [mutable? T]) -> uint;
1111
}
1212

13-
native "c-stack-cdecl" mod rustrt {
13+
native "cdecl" mod rustrt {
1414
fn vec_reserve_shared<T>(t: *sys::type_desc,
1515
&v: [mutable? T],
1616
n: uint);

src/lib/win32_fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
native "c-stack-cdecl" mod rustrt {
3+
native "cdecl" mod rustrt {
44
fn rust_list_files(path: str) -> [str];
55
}
66

src/lib/win32_os.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
native "c-stack-cdecl" mod libc = "" {
2+
native "cdecl" mod libc = "" {
33
fn read(fd: int, buf: *u8, count: uint) -> int;
44
fn write(fd: int, buf: *u8, count: uint) -> int;
55
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
@@ -87,7 +87,7 @@ fn fclose(file: libc::FILE) {
8787
libc::fclose(file)
8888
}
8989

90-
native "c-stack-cdecl" mod rustrt {
90+
native "cdecl" mod rustrt {
9191
fn rust_process_wait(handle: int) -> int;
9292
fn rust_getcwd() -> str;
9393
}

0 commit comments

Comments
 (0)