move uses of rust ABI in tests to cdecl or c-stack-cdecl as appr

Note: I found a bug in c-stack-cdecl which codes not permit such
native functions to be used as values.  I added an xfail-test
(c-stack-as-value) documenting it.

10 files changed, 26 insertions, 17 deletions

diff --git a/src/test/run-pass/bind-native.rs b/src/test/run-pass/bind-native.rs
index ef0cbd32437..d011071ccd2 100644
--- a/src/test/run-pass/bind-native.rs
+++ b/src/test/run-pass/bind-native.rs
@@ -2,7 +2,7 @@
 Can we bind native things?
 */
 
-native "rust" mod rustrt {
+native "cdecl" mod rustrt {
     fn task_yield();
 }
 
diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs
index 0a76fbe62b9..2505c17b6d0 100644
--- a/src/test/run-pass/binops.rs
+++ b/src/test/run-pass/binops.rs
@@ -117,7 +117,7 @@ fn test_fn() {
     assert (h1 >= h2);
 }
 
-native "rust" mod native_mod = "" {
+native "cdecl" mod native_mod = "" {
     fn do_gc();
     fn unsupervise();
 }
diff --git a/src/test/run-pass/c-stack-as-value.rs b/src/test/run-pass/c-stack-as-value.rs
new file mode 100644
index 00000000000..0b412e23225
--- /dev/null
+++ b/src/test/run-pass/c-stack-as-value.rs
@@ -0,0 +1,9 @@
+// xfail-test
+
+native "c-stack-cdecl" mod rustrt {
+    fn unsupervise();
+}
+
+fn main() {
+    let _foo = rustrt::unsupervise;
+}
diff --git a/src/test/run-pass/conditional-compile.rs b/src/test/run-pass/conditional-compile.rs
index 5ee6d2eaeee..a8b65e52ef9 100644
--- a/src/test/run-pass/conditional-compile.rs
+++ b/src/test/run-pass/conditional-compile.rs
@@ -4,13 +4,13 @@ const b: bool = false;
 const b: bool = true;
 
 #[cfg(bogus)]
-native "rust" mod rustrt {
+native "c-stack-cdecl" mod rustrt {
     // This symbol doesn't exist and would be a link error if this
     // module was translated
     fn bogus();
 }
 
-native "rust" mod rustrt { }
+native "c-stack-cdecl" mod rustrt { }
 
 #[cfg(bogus)]
 type t = int;
@@ -79,7 +79,7 @@ fn test_in_fn_ctxt() {
 }
 
 mod test_native_items {
-    native "rust" mod rustrt {
+    native "c-stack-cdecl" mod rustrt {
         #[cfg(bogus)]
         fn vec_from_buf_shared<T>(ptr: *T, count: uint) -> [T];
         fn vec_from_buf_shared<T>(ptr: *T, count: uint) -> [T];
diff --git a/src/test/run-pass/import-from-native.rs b/src/test/run-pass/import-from-native.rs
index b8837692c07..2d8888e81dd 100644
--- a/src/test/run-pass/import-from-native.rs
+++ b/src/test/run-pass/import-from-native.rs
@@ -3,7 +3,7 @@ mod spam {
     fn eggs() { }
 }
 
-native "rust" mod rustrt {
+native "c-stack-cdecl" mod rustrt {
     import spam::{ham, eggs};
     export ham;
     export eggs;
diff --git a/src/test/run-pass/issue-506.rs b/src/test/run-pass/issue-506.rs
index a1df60b4245..ded303995be 100644
--- a/src/test/run-pass/issue-506.rs
+++ b/src/test/run-pass/issue-506.rs
@@ -5,10 +5,10 @@
 use std;
 import std::task;
 
-native "rust" mod rustrt {
+native "cdecl" mod rustrt {
     fn task_yield();
 }
 
-fn yield_wrap(&&_i: ()) unsafe { rustrt::task_yield(); }
+fn yield_wrap() { rustrt::task_yield(); }
 
 fn main() { task::spawn((), yield_wrap); }
diff --git a/src/test/run-pass/item-attributes.rs b/src/test/run-pass/item-attributes.rs
index 3701d229059..2960b9f5ecd 100644
--- a/src/test/run-pass/item-attributes.rs
+++ b/src/test/run-pass/item-attributes.rs
@@ -29,7 +29,7 @@ mod test_single_attr_outer {
     mod mod1 { }
 
     #[attr = "val"]
-    native "rust" mod rustrt { }
+    native "c-stack-cdecl" mod rustrt { }
 
     #[attr = "val"]
     type t = obj { };
@@ -55,7 +55,7 @@ mod test_multi_attr_outer {
 
     #[attr1 = "val"]
     #[attr2 = "val"]
-    native "rust" mod rustrt { }
+    native "c-stack-cdecl" mod rustrt { }
 
     #[attr1 = "val"]
     #[attr2 = "val"]
@@ -83,7 +83,7 @@ mod test_stmt_single_attr_outer {
         }
 
         #[attr = "val"]
-        native "rust" mod rustrt {
+        native "c-stack-cdecl" mod rustrt {
         }
         */
 
@@ -116,7 +116,7 @@ mod test_stmt_multi_attr_outer {
 
         #[attr1 = "val"]
         #[attr2 = "val"]
-        native "rust" mod rustrt {
+        native "c-stack-cdecl" mod rustrt {
         }
         */
 
@@ -182,7 +182,7 @@ mod test_other_forms {
 }
 
 mod test_native_items {
-    native "rust" mod rustrt {
+    native "c-stack-cdecl" mod rustrt {
         #[attr];
 
         #[attr]
diff --git a/src/test/run-pass/native-mod.rc b/src/test/run-pass/native-mod.rc
index 73912355ef8..793273b1a09 100644
--- a/src/test/run-pass/native-mod.rc
+++ b/src/test/run-pass/native-mod.rc
@@ -10,7 +10,7 @@ native mod libc = target_libc {
   fn free(int p) -> ();
 }
 
-native "rust" mod rustrt {
+native "c-stack-cdecl" mod rustrt {
   fn str_buf(str s) -> int;
 }
 
diff --git a/src/test/run-pass/native.rc b/src/test/run-pass/native.rc
index 599ee9e7f24..6b16987bf9b 100644
--- a/src/test/run-pass/native.rc
+++ b/src/test/run-pass/native.rc
@@ -1,7 +1,7 @@
 // xfail-test
 // -*- rust -*-
 
-native "rust" mod rustrt {
+native "c-stack-cdecl" mod rustrt {
   fn str_buf(str s) -> int;
 }
 
diff --git a/src/test/run-pass/native2.rs b/src/test/run-pass/native2.rs
index c0340387cfe..10dd045028d 100644
--- a/src/test/run-pass/native2.rs
+++ b/src/test/run-pass/native2.rs
@@ -1,10 +1,10 @@
 
 
-native "rust" mod rustrt {
+native "c-stack-cdecl" mod rustrt {
     fn unsupervise();
 }
 
-native "rust" mod bar = "" { }
+native "c-stack-cdecl" mod bar = "" { }
 
 native "cdecl" mod zed = "" { }