dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #240 from Manishearth/shadow_scope 

correct scoping for shadow lints
This commit is contained in:
llogiq 2015-08-25 23:56:57 +02:00
parent c9b849bdc8 51a211503d
commit 5e341715cd
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/shadow.rs
View File

@ -81,8 +81,9 @@ fn check_pat<T>(cx: &Context, pat: &Pat, init: &Option<T>, span: Span,
if is_binding(cx, pat) {
if bindings.contains(&name) {
lint_shadow(cx, name, span, pat.span, init);
} else {
bindings.push(name);
}
bindings.push(name);
}
if let Some(ref p) = *inner { check_pat(cx, p, init, span, bindings); }
},
@ -161,6 +162,7 @@ fn check_expr(cx: &Context, expr: &Expr, bindings: &mut Vec<Name>) {
},
ExprMatch(ref init, ref arms, _) => {
check_expr(cx, init, bindings);
let len = bindings.len();
for ref arm in arms {
for ref pat in &arm.pats {
check_pat(cx, &pat, &Some(&**init), pat.span, bindings);
@ -170,6 +172,7 @@ fn check_expr(cx: &Context, expr: &Expr, bindings: &mut Vec<Name>) {
check_expr(cx, guard, bindings);
}
check_expr(cx, &arm.body, bindings);
bindings.truncate(len);
}
},
_ => ()

8
tests/compile-fail/shadow.rs
View File

@ -19,4 +19,12 @@ fn main() {
let x = first(x); //~ERROR: x is shadowed by first(x) which reuses
let y = 1;
let x = y; //~ERROR: x is shadowed by y in this declaration
let o = Some(1u8);
if let Some(p) = o { assert_eq!(1, p); }
match o {
Some(p) => p, // no error, because the p above is in its own scope
None => 0,
};
}