@@ -195,7 +195,7 @@ fn check_pat(cx: &LateContext, pat: &Pat, init: &Option<&Expr>, span: Span, bind
195
195
}
196
196
}
197
197
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 )
199
199
where T : Deref < Target = Expr >
200
200
{
201
201
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: &
209
209
SHADOW_SAME ,
210
210
span,
211
211
& format ! ( "{} is shadowed by itself in {}" ,
212
- snippet( cx, lspan , "_" ) ,
212
+ snippet( cx, pattern_span , "_" ) ,
213
213
snippet( cx, expr. span, ".." ) ) ) ;
214
214
note_orig ( cx, db, SHADOW_SAME , prev_span) ;
215
215
} else if contains_self ( name, expr) {
216
216
let db = span_note_and_lint ( cx,
217
217
SHADOW_REUSE ,
218
- lspan ,
218
+ pattern_span ,
219
219
& format ! ( "{} is shadowed by {} which reuses the original value" ,
220
- snippet( cx, lspan , "_" ) ,
220
+ snippet( cx, pattern_span , "_" ) ,
221
221
snippet( cx, expr. span, ".." ) ) ,
222
222
expr. span ,
223
223
"initialization happens here" ) ;
224
224
note_orig ( cx, db, SHADOW_REUSE , prev_span) ;
225
225
} else {
226
226
let db = span_note_and_lint ( cx,
227
227
SHADOW_UNRELATED ,
228
- lspan ,
228
+ pattern_span ,
229
229
& format ! ( "{} is shadowed by {}" ,
230
- snippet( cx, lspan , "_" ) ,
230
+ snippet( cx, pattern_span , "_" ) ,
231
231
snippet( cx, expr. span, ".." ) ) ,
232
232
expr. span ,
233
233
"initialization happens here" ) ;
@@ -238,7 +238,7 @@ fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, lspan: Span, init: &
238
238
let db = span_lint ( cx,
239
239
SHADOW_UNRELATED ,
240
240
span,
241
- & format ! ( "{} shadows a previous declaration" , snippet( cx, lspan , "_" ) ) ) ;
241
+ & format ! ( "{} shadows a previous declaration" , snippet( cx, pattern_span , "_" ) ) ) ;
242
242
note_orig ( cx, db, SHADOW_UNRELATED , prev_span) ;
243
243
}
244
244
}
0 commit comments