Skip to content

Commit f004120

Browse files
committed
properly lint function argument patterns in similar_names
1 parent 49e2570 commit f004120

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/non_expressive_names.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ impl EarlyLintPass for NonExpressiveNames {
259259
};
260260
// initialize with function arguments
261261
for arg in &decl.inputs {
262-
visit::walk_pat(&mut SimilarNamesNameVisitor(&mut visitor), &arg.pat);
262+
SimilarNamesNameVisitor(&mut visitor).visit_pat(&arg.pat);
263263
}
264264
// walk all other bindings
265265
walk_block(&mut visitor, blk);

src/shadow.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ fn check_pat(cx: &LateContext, pat: &Pat, init: &Option<&Expr>, span: Span, bind
195195
}
196196
}
197197

198-
fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, lspan: Span, init: &Option<T>, prev_span: Span)
198+
fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, pattern_span: Span, init: &Option<T>, prev_span: Span)
199199
where T: Deref<Target = Expr>
200200
{
201201
fn note_orig(cx: &LateContext, mut db: DiagnosticWrapper, lint: &'static Lint, span: Span) {
@@ -209,25 +209,25 @@ fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, lspan: Span, init: &
209209
SHADOW_SAME,
210210
span,
211211
&format!("{} is shadowed by itself in {}",
212-
snippet(cx, lspan, "_"),
212+
snippet(cx, pattern_span, "_"),
213213
snippet(cx, expr.span, "..")));
214214
note_orig(cx, db, SHADOW_SAME, prev_span);
215215
} else if contains_self(name, expr) {
216216
let db = span_note_and_lint(cx,
217217
SHADOW_REUSE,
218-
lspan,
218+
pattern_span,
219219
&format!("{} is shadowed by {} which reuses the original value",
220-
snippet(cx, lspan, "_"),
220+
snippet(cx, pattern_span, "_"),
221221
snippet(cx, expr.span, "..")),
222222
expr.span,
223223
"initialization happens here");
224224
note_orig(cx, db, SHADOW_REUSE, prev_span);
225225
} else {
226226
let db = span_note_and_lint(cx,
227227
SHADOW_UNRELATED,
228-
lspan,
228+
pattern_span,
229229
&format!("{} is shadowed by {}",
230-
snippet(cx, lspan, "_"),
230+
snippet(cx, pattern_span, "_"),
231231
snippet(cx, expr.span, "..")),
232232
expr.span,
233233
"initialization happens here");
@@ -238,7 +238,7 @@ fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, lspan: Span, init: &
238238
let db = span_lint(cx,
239239
SHADOW_UNRELATED,
240240
span,
241-
&format!("{} shadows a previous declaration", snippet(cx, lspan, "_")));
241+
&format!("{} shadows a previous declaration", snippet(cx, pattern_span, "_")));
242242
note_orig(cx, db, SHADOW_UNRELATED, prev_span);
243243
}
244244
}

0 commit comments

Comments
 (0)