about summary refs log tree commit diff
path: root/src/comp
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2011-10-11 18:02:51 -0700
committerBrian Anderson <banderson@mozilla.com>2011-10-12 16:33:07 -0700
commita56698575c26a1238409ac638f0912f68dbfa7f5 (patch)
treef4b4533dd2d97ab985304f29e80d394c7a5eb37f /src/comp
parente8a29fbe3cc662898dd9d7a25f9f6708e31fe6b8 (diff)
downloadrust-a56698575c26a1238409ac638f0912f68dbfa7f5.tar.gz
rust-a56698575c26a1238409ac638f0912f68dbfa7f5.zip
fix error msg
Diffstat (limited to 'src/comp')
-rw-r--r--src/comp/middle/typeck.rs10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs
index f848cf638f8..2f115b8e836 100644
--- a/src/comp/middle/typeck.rs
+++ b/src/comp/middle/typeck.rs
@@ -1553,18 +1553,12 @@ fn require_pure_call(ccx: @crate_ctxt, caller_purity: ast::purity,
       ast::impure_fn. {
         let sess = ccx.tcx.sess;
         alt ccx.tcx.def_map.find(callee.id) {
-          some(ast::def_fn(_, ast::unsafe_fn.)) {
-            if sess.get_opts().check_unsafe {
-                ccx.tcx.sess.span_fatal(
-                    sp,
-                    "safe function calls function marked unsafe");
-            }
-          }
+          some(ast::def_fn(_, ast::unsafe_fn.)) |
           some(ast::def_native_fn(_, ast::unsafe_fn.)) {
             if sess.get_opts().check_unsafe {
                 ccx.tcx.sess.span_fatal(
                     sp,
-                    "native functions can only be invoked from unsafe code");
+                    "safe function calls function marked unsafe");
             }
           }
           _ {