Skip to content

Commit 1103fe8

Browse files
committed
Remove native "rust" ABI
1 parent b0c2416 commit 1103fe8

File tree

7 files changed

+2
-13
lines changed

7 files changed

+2
-13
lines changed

src/comp/metadata/creader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fn visit_view_item(e: env, i: @ast::view_item) {
5151
fn visit_item(e: env, i: @ast::item) {
5252
alt i.node {
5353
ast::item_native_mod(m) {
54-
if m.abi != ast::native_abi_rust && m.abi != ast::native_abi_cdecl &&
54+
if m.abi != ast::native_abi_cdecl &&
5555
m.abi != ast::native_abi_c_stack_cdecl &&
5656
m.abi != ast::native_abi_c_stack_stdcall {
5757
ret;

src/comp/metadata/tydecode.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ fn parse_ty(st: @pstate, sd: str_def) -> ty::t {
259259
'N' {
260260
let abi;
261261
alt next(st) as char {
262-
'r' { abi = ast::native_abi_rust; }
263262
'i' { abi = ast::native_abi_rust_intrinsic; }
264263
'c' { abi = ast::native_abi_cdecl; }
265264
'l' { abi = ast::native_abi_llvm; }

src/comp/metadata/tyencode.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ fn enc_sty(w: io::writer, cx: @ctxt, st: ty::sty) {
142142
ty::ty_native_fn(abi, args, out) {
143143
w.write_char('N');
144144
alt abi {
145-
native_abi_rust. { w.write_char('r'); }
146145
native_abi_rust_intrinsic. { w.write_char('i'); }
147146
native_abi_cdecl. { w.write_char('c'); }
148147
native_abi_llvm. { w.write_char('l'); }

src/comp/middle/trans.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5531,7 +5531,7 @@ fn native_fn_ty_param_count(cx: @crate_ctxt, id: ast::node_id) -> uint {
55315531

55325532
pure fn native_abi_requires_pair(abi: ast::native_abi) -> bool {
55335533
alt abi {
5534-
ast::native_abi_rust. | ast::native_abi_cdecl. |
5534+
ast::native_abi_cdecl. |
55355535
ast::native_abi_llvm. | ast::native_abi_rust_intrinsic. |
55365536
ast::native_abi_x86stdcall. { ret true; }
55375537
ast::native_abi_c_stack_cdecl. |
@@ -5571,11 +5571,6 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, path: [str], name: str,
55715571
let uses_retptr;
55725572
let cast_to_i32;
55735573
alt abi {
5574-
ast::native_abi_rust. {
5575-
pass_task = false;
5576-
uses_retptr = false;
5577-
cast_to_i32 = true;
5578-
}
55795574
ast::native_abi_rust_intrinsic. {
55805575
pass_task = true;
55815576
uses_retptr = true;

src/comp/syntax/ast.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,6 @@ type anon_obj =
426426
type _mod = {view_items: [@view_item], items: [@item]};
427427

428428
tag native_abi {
429-
native_abi_rust;
430429
native_abi_cdecl;
431430
native_abi_llvm;
432431
native_abi_rust_intrinsic;

src/comp/syntax/parse/parser.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,8 +2007,6 @@ fn parse_item_native_mod(p: parser, attrs: [ast::attribute]) -> @ast::item {
20072007
if !is_word(p, "mod") {
20082008
let t = parse_str(p);
20092009
if str::eq(t, "cdecl") {
2010-
} else if str::eq(t, "rust") {
2011-
abi = ast::native_abi_rust;
20122010
} else if str::eq(t, "llvm") {
20132011
abi = ast::native_abi_llvm;
20142012
} else if str::eq(t, "rust-intrinsic") {

src/comp/syntax/print/pprust.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,6 @@ fn print_item(s: ps, &&item: @ast::item) {
402402
head(s, "native");
403403
alt nmod.abi {
404404
ast::native_abi_llvm. { word_nbsp(s, "\"llvm\""); }
405-
ast::native_abi_rust. { word_nbsp(s, "\"rust\""); }
406405
ast::native_abi_cdecl. { word_nbsp(s, "\"cdecl\""); }
407406
ast::native_abi_rust_intrinsic. {
408407
word_nbsp(s, "\"rust-intrinsic\"");

0 commit comments

Comments
 (0)