about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2011-10-10 15:19:34 -0700
committerBrian Anderson <banderson@mozilla.com>2011-10-12 16:33:06 -0700
commitdb16fce77f142db2df1dceaaf2b7d04a073a8095 (patch)
tree102abf92c9a6219a01506a9cd43bb63257aeb8f3
parent85da98db4ae228f8b3d1b1ebf702b0fea99bd7e6 (diff)
downloadrust-db16fce77f142db2df1dceaaf2b7d04a073a8095.tar.gz
rust-db16fce77f142db2df1dceaaf2b7d04a073a8095.zip
all tests pass
-rw-r--r--src/compiletest/procsrv.rs4
-rw-r--r--src/test/run-pass/interior-vec.rs2
-rw-r--r--src/test/run-pass/issue-506.rs2
-rw-r--r--src/test/run-pass/unify-return-ty.rs2
-rw-r--r--src/test/run-pass/unique-copy-box.rs2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index 6a74d044bfb..467b98d8b64 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -79,7 +79,7 @@ fn writeclose(fd: int, s: option::t<str>) unsafe {
     os::libc::close(fd);
 }
 
-fn readclose(fd: int) -> str {
+fn readclose(fd: int) -> str unsafe {
     // Copied from run::program_output
     let file = os::fd_FILE(fd);
     let reader = io::new_reader(io::FILE_buf_reader(file, option::none));
@@ -92,7 +92,7 @@ fn readclose(fd: int) -> str {
     ret buf;
 }
 
-fn worker(p: port<request>) {
+fn worker(p: port<request>) unsafe {
 
     // FIXME (787): If we declare this inside of the while loop and then
     // break out of it before it's ever initialized (i.e. we don't run
diff --git a/src/test/run-pass/interior-vec.rs b/src/test/run-pass/interior-vec.rs
index 0c0a3c17179..b2836779046 100644
--- a/src/test/run-pass/interior-vec.rs
+++ b/src/test/run-pass/interior-vec.rs
@@ -4,7 +4,7 @@ native "rust-intrinsic" mod rusti {
     fn vec_len<T>(&&v: [T]) -> uint;
 }
 
-fn main() {
+fn main() unsafe {
     let v: [int] = [];
     assert (vec_len(v) == 0u); // zero-length
     let x = [1, 2];
diff --git a/src/test/run-pass/issue-506.rs b/src/test/run-pass/issue-506.rs
index 8285b5e1f3b..2ed94852bf9 100644
--- a/src/test/run-pass/issue-506.rs
+++ b/src/test/run-pass/issue-506.rs
@@ -9,6 +9,6 @@ native "rust" mod rustrt {
     fn task_yield();
 }
 
-fn yield_wrap() { rustrt::task_yield(); }
+fn yield_wrap() unsafe { rustrt::task_yield(); }
 
 fn main() { let f = yield_wrap; task::spawn(f); }
diff --git a/src/test/run-pass/unify-return-ty.rs b/src/test/run-pass/unify-return-ty.rs
index b8f9a39f50b..2a22499e8c7 100644
--- a/src/test/run-pass/unify-return-ty.rs
+++ b/src/test/run-pass/unify-return-ty.rs
@@ -4,6 +4,6 @@
 use std;
 import std::unsafe;
 
-fn null<@T>() -> *T { unsafe::reinterpret_cast(0) }
+fn null<@T>() -> *T unsafe { unsafe::reinterpret_cast(0) }
 
 fn main() { null::<int>(); }
diff --git a/src/test/run-pass/unique-copy-box.rs b/src/test/run-pass/unique-copy-box.rs
index d7a5e3fe850..6a54407b458 100644
--- a/src/test/run-pass/unique-copy-box.rs
+++ b/src/test/run-pass/unique-copy-box.rs
@@ -1,7 +1,7 @@
 use std;
 import std::sys::rustrt::refcount;
 
-fn main() {
+fn main() unsafe {
     let i = ~@1;
     let j = ~@2;
     let rc1 = refcount(*i);