---

yaml
---
r: 5804
b: refs/heads/master
c: a566985
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a29fbe3cc662898dd9d7a25f9f6708e31fe6b8
+refs/heads/master: a56698575c26a1238409ac638f0912f68dbfa7f5

trunk/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");
             }
           }
           _ {

trunk/src/test/compile-fail/native-unsafe-fn-called.rs

@@ -1,6 +1,5 @@
 // -*- rust -*-
 // error-pattern: safe function calls function marked unsafe
-
 native "cdecl" mod test {
     unsafe fn free();
 }