OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't warn about unsafe functions which don't need to be unsafe

Browse Source
This commit is contained in:
Alex Crichton 2013-04-20 15:51:29 -04:00
parent 2b09267b76
commit 3c2a44b60f
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librustc/middle/lint.rs
View File

@ -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

7
src/test/compile-fail/unused-unsafe.rs
View File

@ -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() { }