user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update rust to 0efb9dab8c7c07fa28e9df0eccc5c07ea3c17fbb (HIR+lints, Thu Sep 3 18:59:56 2015 +0530)

Browse source 
fixes #294
This commit is contained in:
Manish Goregaokar 2015-09-03 20:12:17 +05:30
parent 5b7ec55fc2
commit eca185438b
27 changed files with 66 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/shadow.rs
View file

@ -1,7 +1,8 @@
use std::ops::Deref;
use syntax::ast::*;
use rustc_front::hir::*;
use reexport::*;
use syntax::codemap::Span;
use syntax::visit::FnKind;
use rustc_front::visit::FnKind;
use rustc::lint::{Context, LintArray, LintPass};
use rustc::middle::def::Def::{DefVariant, DefStruct};
@ -47,8 +48,7 @@ fn check_block(cx: &Context, block: &Block, bindings: &mut Vec<Name>) {
match stmt.node {
StmtDecl(ref decl, _) => check_decl(cx, decl, bindings),
StmtExpr(ref e, _) | StmtSemi(ref e, _) =>
check_expr(cx, e, bindings),
_ => ()
check_expr(cx, e, bindings)
}
}
if let Some(ref o) = block.expr { check_expr(cx, o, bindings); }
@ -320,8 +320,7 @@ fn contains_block_self(name: Name, block: &Block) -> bool {
}
},
StmtExpr(ref e, _) | StmtSemi(ref e, _) =>
if contains_self(name, e) { return true },
_ => ()
if contains_self(name, e) { return true }
}
}
if let Some(ref e) = block.expr { contains_self(name, e) } else { false }