Skip to content

Commit cefbe2d

Browse files
nikomatsakisbrson
authored andcommitted
---
yaml --- r: 5947 b: refs/heads/master c: 973a285 h: refs/heads/master i: 5945: dc588a7 5943: c2290a5 v: v3
1 parent a2a1982 commit cefbe2d

File tree

11 files changed

+27
-18
lines changed

11 files changed

+27
-18
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: f8de679c1e7de9a099e0c98f6440e6e01978ce7f
2+
refs/heads/master: 973a2853719ddf5aa23bec8d6aeb41b8a803c7ff

trunk/src/test/run-pass/bind-native.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Can we bind native things?
33
*/
44

5-
native "rust" mod rustrt {
5+
native "cdecl" mod rustrt {
66
fn task_yield();
77
}
88

trunk/src/test/run-pass/binops.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ fn test_fn() {
117117
assert (h1 >= h2);
118118
}
119119

120-
native "rust" mod native_mod = "" {
120+
native "cdecl" mod native_mod = "" {
121121
fn do_gc();
122122
fn unsupervise();
123123
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// xfail-test
2+
3+
native "c-stack-cdecl" mod rustrt {
4+
fn unsupervise();
5+
}
6+
7+
fn main() {
8+
let _foo = rustrt::unsupervise;
9+
}

trunk/src/test/run-pass/conditional-compile.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ const b: bool = false;
44
const b: bool = true;
55

66
#[cfg(bogus)]
7-
native "rust" mod rustrt {
7+
native "c-stack-cdecl" mod rustrt {
88
// This symbol doesn't exist and would be a link error if this
99
// module was translated
1010
fn bogus();
1111
}
1212

13-
native "rust" mod rustrt { }
13+
native "c-stack-cdecl" mod rustrt { }
1414

1515
#[cfg(bogus)]
1616
type t = int;
@@ -79,7 +79,7 @@ fn test_in_fn_ctxt() {
7979
}
8080

8181
mod test_native_items {
82-
native "rust" mod rustrt {
82+
native "c-stack-cdecl" mod rustrt {
8383
#[cfg(bogus)]
8484
fn vec_from_buf_shared<T>(ptr: *T, count: uint) -> [T];
8585
fn vec_from_buf_shared<T>(ptr: *T, count: uint) -> [T];

trunk/src/test/run-pass/import-from-native.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ mod spam {
33
fn eggs() { }
44
}
55

6-
native "rust" mod rustrt {
6+
native "c-stack-cdecl" mod rustrt {
77
import spam::{ham, eggs};
88
export ham;
99
export eggs;

trunk/src/test/run-pass/issue-506.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
use std;
66
import std::task;
77

8-
native "rust" mod rustrt {
8+
native "cdecl" mod rustrt {
99
fn task_yield();
1010
}
1111

12-
fn yield_wrap(&&_i: ()) unsafe { rustrt::task_yield(); }
12+
fn yield_wrap() { rustrt::task_yield(); }
1313

1414
fn main() { task::spawn((), yield_wrap); }

trunk/src/test/run-pass/item-attributes.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mod test_single_attr_outer {
2929
mod mod1 { }
3030

3131
#[attr = "val"]
32-
native "rust" mod rustrt { }
32+
native "c-stack-cdecl" mod rustrt { }
3333

3434
#[attr = "val"]
3535
type t = obj { };
@@ -55,7 +55,7 @@ mod test_multi_attr_outer {
5555

5656
#[attr1 = "val"]
5757
#[attr2 = "val"]
58-
native "rust" mod rustrt { }
58+
native "c-stack-cdecl" mod rustrt { }
5959

6060
#[attr1 = "val"]
6161
#[attr2 = "val"]
@@ -83,7 +83,7 @@ mod test_stmt_single_attr_outer {
8383
}
8484
8585
#[attr = "val"]
86-
native "rust" mod rustrt {
86+
native "c-stack-cdecl" mod rustrt {
8787
}
8888
*/
8989

@@ -116,7 +116,7 @@ mod test_stmt_multi_attr_outer {
116116
117117
#[attr1 = "val"]
118118
#[attr2 = "val"]
119-
native "rust" mod rustrt {
119+
native "c-stack-cdecl" mod rustrt {
120120
}
121121
*/
122122

@@ -182,7 +182,7 @@ mod test_other_forms {
182182
}
183183

184184
mod test_native_items {
185-
native "rust" mod rustrt {
185+
native "c-stack-cdecl" mod rustrt {
186186
#[attr];
187187

188188
#[attr]

trunk/src/test/run-pass/native-mod.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ native mod libc = target_libc {
1010
fn free(int p) -> ();
1111
}
1212

13-
native "rust" mod rustrt {
13+
native "c-stack-cdecl" mod rustrt {
1414
fn str_buf(str s) -> int;
1515
}
1616

trunk/src/test/run-pass/native.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// xfail-test
22
// -*- rust -*-
33

4-
native "rust" mod rustrt {
4+
native "c-stack-cdecl" mod rustrt {
55
fn str_buf(str s) -> int;
66
}
77

trunk/src/test/run-pass/native2.rs

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

22

3-
native "rust" mod rustrt {
3+
native "c-stack-cdecl" mod rustrt {
44
fn unsupervise();
55
}
66

7-
native "rust" mod bar = "" { }
7+
native "c-stack-cdecl" mod bar = "" { }
88

99
native "cdecl" mod zed = "" { }
1010

0 commit comments

Comments
 (0)