Skip to content

Commit 10c3595

Browse files
committed
rustc: Rename native_abi_c_stack_stdcall to native_abi_stdcall
1 parent c7f0ca6 commit 10c3595

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

src/comp/metadata/creader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fn visit_item(e: env, i: @ast::item) {
5252
alt i.node {
5353
ast::item_native_mod(m) {
5454
if m.abi != ast::native_abi_c_stack_cdecl &&
55-
m.abi != ast::native_abi_c_stack_stdcall {
55+
m.abi != ast::native_abi_stdcall {
5656
ret;
5757
}
5858
let cstore = e.sess.get_cstore();

src/comp/metadata/tydecode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ fn parse_ty(st: @pstate, sd: str_def) -> ty::t {
261261
alt next(st) as char {
262262
'i' { abi = ast::native_abi_rust_intrinsic; }
263263
'C' { abi = ast::native_abi_c_stack_cdecl; }
264-
'S' { abi = ast::native_abi_c_stack_stdcall; }
264+
'S' { abi = ast::native_abi_stdcall; }
265265
}
266266
let func = parse_ty_fn(st, sd);
267267
ret ty::mk_native_fn(st.tcx, abi, func.args, func.ty);

src/comp/metadata/tyencode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ fn enc_sty(w: io::writer, cx: @ctxt, st: ty::sty) {
144144
alt abi {
145145
native_abi_rust_intrinsic. { w.write_char('i'); }
146146
native_abi_c_stack_cdecl. { w.write_char('C'); }
147-
native_abi_c_stack_stdcall. { w.write_char('S'); }
147+
native_abi_stdcall. { w.write_char('S'); }
148148
}
149149
enc_ty_fn(w, cx, args, out, return_val, []);
150150
}

src/comp/middle/trans.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5598,7 +5598,7 @@ pure fn native_abi_requires_pair(abi: ast::native_abi) -> bool {
55985598
alt abi {
55995599
ast::native_abi_rust_intrinsic. { ret true; }
56005600
ast::native_abi_c_stack_cdecl. |
5601-
ast::native_abi_c_stack_stdcall. { ret false; }
5601+
ast::native_abi_stdcall. { ret false; }
56025602
}
56035603
}
56045604

@@ -5647,7 +5647,7 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, path: [str], name: str,
56475647
ccx.item_symbols.insert(id, name);
56485648
ret;
56495649
}
5650-
ast::native_abi_c_stack_stdcall. {
5650+
ast::native_abi_stdcall. {
56515651
// The name of stdcall functions depend on their argument count
56525652
// so we have to declare them correctly
56535653
let fn_args_tys = ty::ty_fn_args(ccx.tcx, fn_type);

src/comp/syntax/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ type _mod = {view_items: [@view_item], items: [@item]};
428428
tag native_abi {
429429
native_abi_rust_intrinsic;
430430
native_abi_c_stack_cdecl;
431-
native_abi_c_stack_stdcall;
431+
native_abi_stdcall;
432432
}
433433

434434
type native_mod =

src/comp/syntax/parse/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2011,7 +2011,7 @@ fn parse_item_native_mod(p: parser, attrs: [ast::attribute]) -> @ast::item {
20112011
} else if str::eq(t, "c-stack-cdecl") {
20122012
abi = ast::native_abi_c_stack_cdecl;
20132013
} else if str::eq(t, "c-stack-stdcall") {
2014-
abi = ast::native_abi_c_stack_stdcall;
2014+
abi = ast::native_abi_stdcall;
20152015
} else {
20162016
p.fatal("unsupported abi: " + t);
20172017
}

src/comp/syntax/print/pprust.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ fn print_item(s: ps, &&item: @ast::item) {
407407
ast::native_abi_c_stack_cdecl. {
408408
word_nbsp(s, "\"c-stack-cdecl\"");
409409
}
410-
ast::native_abi_c_stack_stdcall. {
410+
ast::native_abi_stdcall. {
411411
word_nbsp(s, "\"c-stack-stdcall\"");
412412
}
413413
}

0 commit comments

Comments
 (0)