---

yaml
---
r: 20486
b: refs/heads/snap-stage3
c: 03cdc24
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 73a24b8abbf73c6111d6f92117abe9cd6b9ef8a8
+refs/heads/snap-stage3: 03cdc2476da62ce3d55d18c649f2b479baa89794
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/run-pass/binops.rs

@@ -116,13 +116,13 @@ fn test_fn() {
 #[abi = "cdecl"]
 #[nolink]
 extern mod test {
-    fn unsupervise();
+    fn rust_get_sched_id();
     fn get_task_id();
 }
 
 fn test_foreign_fn() {
-    assert test::unsupervise != test::get_task_id;
-    assert test::unsupervise == test::unsupervise;
+    assert test::rust_get_sched_id != test::get_task_id;
+    assert test::rust_get_sched_id == test::rust_get_sched_id;
 }
 
 class p {

branches/snap-stage3/src/test/run-pass/c-stack-as-value.rs

@@ -1,8 +1,8 @@
 #[abi = "cdecl"]
 extern mod rustrt {
-    fn unsupervise();
+    fn get_task_id();
 }
 
 fn main() {
-    let _foo = rustrt::unsupervise;
+    let _foo = rustrt::get_task_id;
 }

branches/snap-stage3/src/test/run-pass/foreign-no-abi.rs

@@ -1,9 +1,9 @@
 // ABI is cdecl by default
 
 extern mod rustrt {
-    fn unsupervise();
+    fn get_task_id() -> int;
 }
 
 fn main() {
-    rustrt::unsupervise();
-}
+    rustrt::get_task_id();
+}

branches/snap-stage3/src/test/run-pass/foreign2.rs

@@ -1,10 +1,3 @@
-
-
-#[abi = "cdecl"]
-extern mod rustrt {
-    fn unsupervise();
-}
-
 #[abi = "cdecl"]
 #[nolink]
 extern mod bar { }

branches/snap-stage3/src/test/run-pass/issue-1251.rs

@@ -1,7 +1,7 @@
-#[link(name = "unsupervise")];
+#[link(name = "get_task_id")];
 
 extern mod rustrt {
-      fn unsupervise();
+      fn get_task_id() -> int;
 }
 
 fn main() { }

branches/snap-stage3/src/test/run-pass/issue-506.rs

@@ -9,7 +9,7 @@ import task;
 
 #[abi = "cdecl"]
 extern mod rustrt {
-    fn unsupervise();
+    fn get_task_id();
 }
 
-fn main() { task::spawn(rustrt::unsupervise); }
+fn main() { task::spawn(rustrt::get_task_id); }

branches/snap-stage3/src/test/run-pass/item-attributes.rs

@@ -163,7 +163,7 @@ mod test_foreign_items {
         #[attr];
 
         #[attr]
-        fn unsupervise();
+        fn get_task_id() -> int;
     }
 }
 

branches/snap-stage3/src/test/run-pass/morestack6.rs

@@ -8,15 +8,15 @@ import std::rand;
 extern mod rustrt {
     fn debug_get_stk_seg() -> *u8;
 
-    fn unsupervise();
+    fn rust_get_sched_id() -> int;
     fn last_os_error() -> ~str;
     fn rust_getcwd() -> ~str;
     fn get_task_id();
     fn sched_threads();
     fn rust_get_task();
 }
 
-fn calllink01() { rustrt::unsupervise(); }
+fn calllink01() { rustrt::rust_get_sched_id(); }
 fn calllink02() { rustrt::last_os_error(); }
 fn calllink03() { rustrt::rust_getcwd(); }
 fn calllink08() { rustrt::get_task_id(); }