nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

properly lint function argument patterns in similar_names

Browse Source
This commit is contained in:
Oliver Schneider 2016-05-11 16:45:06 +02:00
parent 49e2570b77
commit f004120495
No known key found for this signature in database
GPG Key ID: 56D6EEA0FC67AC46
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/non_expressive_names.rs
View File

@ -259,7 +259,7 @@ impl EarlyLintPass for NonExpressiveNames {
}; };
// initialize with function arguments // initialize with function arguments
for arg in &decl.inputs { for arg in &decl.inputs {
visit::walk_pat(&mut SimilarNamesNameVisitor(&mut visitor), &arg.pat); SimilarNamesNameVisitor(&mut visitor).visit_pat(&arg.pat);
} }
// walk all other bindings // walk all other bindings
walk_block(&mut visitor, blk); walk_block(&mut visitor, blk);

14
src/shadow.rs
View File

@ -195,7 +195,7 @@ fn check_pat(cx: &LateContext, pat: &Pat, init: &Option<&Expr>, span: Span, bind
} }
} }
fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, lspan: Span, init: &Option<T>, prev_span: Span) fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, pattern_span: Span, init: &Option<T>, prev_span: Span)
where T: Deref<Target = Expr> where T: Deref<Target = Expr>
{ {
fn note_orig(cx: &LateContext, mut db: DiagnosticWrapper, lint: &'static Lint, span: Span) { fn note_orig(cx: &LateContext, mut db: DiagnosticWrapper, lint: &'static Lint, span: Span) {
@ -209,15 +209,15 @@ fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, lspan: Span, init: &
SHADOW_SAME, SHADOW_SAME,
span, span,
&format!("{} is shadowed by itself in {}", &format!("{} is shadowed by itself in {}",
snippet(cx, lspan, "_"), snippet(cx, pattern_span, "_"),
snippet(cx, expr.span, ".."))); snippet(cx, expr.span, "..")));
note_orig(cx, db, SHADOW_SAME, prev_span); note_orig(cx, db, SHADOW_SAME, prev_span);
} else if contains_self(name, expr) { } else if contains_self(name, expr) {
let db = span_note_and_lint(cx, let db = span_note_and_lint(cx,
SHADOW_REUSE, SHADOW_REUSE,
lspan, pattern_span,
&format!("{} is shadowed by {} which reuses the original value", &format!("{} is shadowed by {} which reuses the original value",
snippet(cx, lspan, "_"), snippet(cx, pattern_span, "_"),
snippet(cx, expr.span, "..")), snippet(cx, expr.span, "..")),
expr.span, expr.span,
"initialization happens here"); "initialization happens here");
@ -225,9 +225,9 @@ fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, lspan: Span, init: &
} else { } else {
let db = span_note_and_lint(cx, let db = span_note_and_lint(cx,
SHADOW_UNRELATED, SHADOW_UNRELATED,
lspan, pattern_span,
&format!("{} is shadowed by {}", &format!("{} is shadowed by {}",
snippet(cx, lspan, "_"), snippet(cx, pattern_span, "_"),
snippet(cx, expr.span, "..")), snippet(cx, expr.span, "..")),
expr.span, expr.span,
"initialization happens here"); "initialization happens here");
@ -238,7 +238,7 @@ fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, lspan: Span, init: &
let db = span_lint(cx, let db = span_lint(cx,
SHADOW_UNRELATED, SHADOW_UNRELATED,
span, span,
&format!("{} shadows a previous declaration", snippet(cx, lspan, "_"))); &format!("{} shadows a previous declaration", snippet(cx, pattern_span, "_")));
note_orig(cx, db, SHADOW_UNRELATED, prev_span); note_orig(cx, db, SHADOW_UNRELATED, prev_span);
} }
} }