auto merge of #5978 : alexcrichton/rust/issue-5954, r=catamorphism

Closes #5954

Author: bors

src/librustc/middle/lint.rs

@@ -260,7 +260,7 @@ pub fn get_lint_dict() -> LintDict {
         (~"unused_unsafe",
          LintSpec {
             lint: unused_unsafe,
-            desc: "unnecessary use of an \"unsafe\" block or function",
+            desc: "unnecessary use of an \"unsafe\" block",
             default: warn
         }),
 
@@ -958,17 +958,6 @@ fn check_fn(tcx: ty::ctxt, fk: &visit::fn_kind, decl: &ast::fn_decl,
             _body: &ast::blk, span: span, id: ast::node_id) {
     debug!("lint check_fn fk=%? id=%?", fk, id);
 
-    // Check for an 'unsafe fn' which doesn't need to be unsafe
-    match *fk {
-        visit::fk_item_fn(_, _, ast::unsafe_fn, _) => {
-            if !tcx.used_unsafe.contains(&id) {
-                tcx.sess.span_lint(unused_unsafe, id, id, span,
-                                   ~"unnecessary \"unsafe\" function");
-            }
-        }
-        _ => ()
-    }
-
     // Check for deprecated modes
     match *fk {
         // don't complain about blocks, since they tend to get their modes

src/test/compile-fail/unused-unsafe.rs

@@ -18,9 +18,7 @@ fn callback<T>(_f: &fn() -> T) -> T { fail!() }
 
 fn bad1() { unsafe {} }                  //~ ERROR: unnecessary "unsafe" block
 fn bad2() { unsafe { bad1() } }          //~ ERROR: unnecessary "unsafe" block
-unsafe fn bad3() {}                      //~ ERROR: unnecessary "unsafe" function
-unsafe fn bad4() { unsafe {} }           //~ ERROR: unnecessary "unsafe" function
-                                         //~^ ERROR: unnecessary "unsafe" block
+unsafe fn bad4() { unsafe {} }           //~ ERROR: unnecessary "unsafe" block
 fn bad5() { unsafe { do callback {} } }  //~ ERROR: unnecessary "unsafe" block
 
 unsafe fn good0() { libc::exit(1) }
@@ -38,7 +36,6 @@ fn good2() {
     }
 }
 
-#[allow(unused_unsafe)] unsafe fn allowed0() {}
-#[allow(unused_unsafe)] fn allowed1() { unsafe {} }
+#[allow(unused_unsafe)] fn allowed() { unsafe {} }
 
 fn main() { }