nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-22 04:34:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70 from Manishearth/issue_69

Browse Source 
Issue #69 fixed
This commit is contained in:
llogiq 2015-05-26 01:46:30 +02:00
commit fee230c07e
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/mut_mut.rs
View File

@ -2,6 +2,7 @@ use syntax::ptr::P;
use syntax::ast::*;
use rustc::lint::{Context, LintPass, LintArray, Lint};
use rustc::middle::ty::{expr_ty, sty, ty_ptr, ty_rptr, mt};
use syntax::codemap::ExpnInfo;
declare_lint!(pub MUT_MUT, Warn,
"Warn on usage of double-mut refs, e.g. '&mut &mut ...'");
@ -15,27 +16,8 @@ impl LintPass for MutMut {
}
fn check_expr(&mut self, cx: &Context, expr: &Expr) {
fn unwrap_addr(expr : &Expr) -> Option<&Expr> {
match expr.node {
ExprAddrOf(MutMutable, ref e) => Option::Some(e),
_ => Option::None
}
}
unwrap_addr(expr).map_or((), |e| {
unwrap_addr(e).map(|_| {
cx.span_lint(MUT_MUT, expr.span,
"Generally you want to avoid &mut &mut _ if possible.")
}).unwrap_or_else(|| {
if let ty_rptr(_, mt{ty: _, mutbl: MutMutable}) =
expr_ty(cx.tcx, e).sty {
cx.span_lint(MUT_MUT, expr.span,
"This expression mutably borrows a mutable reference. \
Consider reborrowing")
}
})
})
cx.sess().codemap().with_expn_info(expr.span.expn_id,
|info| check_expr_expd(cx, expr, info))
}
fn check_ty(&mut self, cx: &Context, ty: &Ty) {
@ -44,6 +26,35 @@ impl LintPass for MutMut {
}
}
fn check_expr_expd(cx: &Context, expr: &Expr, info: Option<&ExpnInfo>) {
if in_external_macro(info) { return; }
fn unwrap_addr(expr : &Expr) -> Option<&Expr> {
match expr.node {
ExprAddrOf(MutMutable, ref e) => Option::Some(e),
_ => Option::None
}
}
unwrap_addr(expr).map_or((), |e| {
unwrap_addr(e).map(|_| {
cx.span_lint(MUT_MUT, expr.span,
"Generally you want to avoid &mut &mut _ if possible.")
}).unwrap_or_else(|| {
if let ty_rptr(_, mt{ty: _, mutbl: MutMutable}) =
expr_ty(cx.tcx, e).sty {
cx.span_lint(MUT_MUT, expr.span,
"This expression mutably borrows a mutable reference. \
Consider reborrowing")
}
})
})
}
fn in_external_macro(info: Option<&ExpnInfo>) -> bool {
info.map_or(false, |i| i.callee.span.is_some())
}
fn unwrap_mut(ty : &Ty) -> Option<&Ty> {
match ty.node {
TyPtr(MutTy{ ty: ref pty, mutbl: MutMutable }) => Option::Some(pty),

2
src/ptr_arg.rs
View File

@ -27,7 +27,7 @@ impl LintPass for PtrArg {
}
fn check_item(&mut self, cx: &Context, item: &Item) {
if let &ItemFn(ref decl, _, _, _, _) = &item.node {
if let &ItemFn(ref decl, _, _, _, _, _) = &item.node {
check_fn(cx, decl);
}
}