about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/foreign-unsafe-fn-called.rs2
-rw-r--r--src/test/compile-fail/foreign-unsafe-fn.rs2
-rw-r--r--src/test/compile-fail/forget-init-unsafe.rs6
-rw-r--r--src/test/compile-fail/unsafe-fn-called-from-safe.rs2
-rw-r--r--src/test/compile-fail/unsafe-fn-used-as-value.rs4
5 files changed, 8 insertions, 8 deletions
diff --git a/src/test/compile-fail/foreign-unsafe-fn-called.rs b/src/test/compile-fail/foreign-unsafe-fn-called.rs
index ed8b8088ee4..2f5258aa7f2 100644
--- a/src/test/compile-fail/foreign-unsafe-fn-called.rs
+++ b/src/test/compile-fail/foreign-unsafe-fn-called.rs
@@ -19,5 +19,5 @@ mod test {
 
 fn main() {
     test::free();
-    //~^ ERROR access to unsafe function requires unsafe function or block
+    //~^ ERROR call to unsafe function requires unsafe function or block
 }
diff --git a/src/test/compile-fail/foreign-unsafe-fn.rs b/src/test/compile-fail/foreign-unsafe-fn.rs
index 3633267d02c..fce269ab517 100644
--- a/src/test/compile-fail/foreign-unsafe-fn.rs
+++ b/src/test/compile-fail/foreign-unsafe-fn.rs
@@ -19,5 +19,5 @@ mod test {
 
 fn main() {
     let x = test::free;
-    //~^ ERROR access to unsafe function requires unsafe function or block
+    //~^ ERROR call to unsafe function requires unsafe function or block
 }
diff --git a/src/test/compile-fail/forget-init-unsafe.rs b/src/test/compile-fail/forget-init-unsafe.rs
index 25ab28b5fc0..9ad7a178fb1 100644
--- a/src/test/compile-fail/forget-init-unsafe.rs
+++ b/src/test/compile-fail/forget-init-unsafe.rs
@@ -12,6 +12,6 @@ use std::unstable::intrinsics::{init, forget};
 
 // Test that the `forget` and `init` intrinsics are really unsafe
 pub fn main() {
-    let stuff = init::<int>(); //~ ERROR access to unsafe function requires unsafe
-    forget(stuff);             //~ ERROR access to unsafe function requires unsafe
-}
\ No newline at end of file
+    let stuff = init::<int>(); //~ ERROR call to unsafe function requires unsafe
+    forget(stuff);             //~ ERROR call to unsafe function requires unsafe
+}
diff --git a/src/test/compile-fail/unsafe-fn-called-from-safe.rs b/src/test/compile-fail/unsafe-fn-called-from-safe.rs
index 864dffea8bf..2ea0f5a4ec9 100644
--- a/src/test/compile-fail/unsafe-fn-called-from-safe.rs
+++ b/src/test/compile-fail/unsafe-fn-called-from-safe.rs
@@ -13,5 +13,5 @@
 unsafe fn f() { return; }
 
 fn main() {
-    f(); //~ ERROR access to unsafe function requires unsafe function or block
+    f(); //~ ERROR call to unsafe function requires unsafe function or block
 }
diff --git a/src/test/compile-fail/unsafe-fn-used-as-value.rs b/src/test/compile-fail/unsafe-fn-used-as-value.rs
index cbfb60f0a32..b5565b4821b 100644
--- a/src/test/compile-fail/unsafe-fn-used-as-value.rs
+++ b/src/test/compile-fail/unsafe-fn-used-as-value.rs
@@ -13,6 +13,6 @@
 unsafe fn f() { return; }
 
 fn main() {
-    let x = f; //~ ERROR access to unsafe function requires unsafe function or block
-    x();
+    let x = f;
+    x();    //~ ERROR call to unsafe function requires unsafe function or block
 }