@@ -268,9 +268,8 @@ impl<'a, 'b, 'tcx> Visitor<'a> for UnusedImportCheckVisitor<'a, 'b, 'tcx> {
268
268
269
269
enum UnusedSpanResult {
270
270
Used ,
271
- FlatUnused { span : Span , remove : Span } ,
272
- NestedFullUnused { spans : Vec < Span > , remove : Span } ,
273
- NestedPartialUnused { spans : Vec < Span > , remove : Vec < Span > } ,
271
+ Unused { spans : Vec < Span > , remove : Span } ,
272
+ PartialUnused { spans : Vec < Span > , remove : Vec < Span > } ,
274
273
}
275
274
276
275
fn calc_unused_spans (
@@ -288,14 +287,14 @@ fn calc_unused_spans(
288
287
match use_tree. kind {
289
288
ast:: UseTreeKind :: Simple ( ..) | ast:: UseTreeKind :: Glob => {
290
289
if unused_import. unused . contains ( & use_tree_id) {
291
- UnusedSpanResult :: FlatUnused { span : use_tree. span , remove : full_span }
290
+ UnusedSpanResult :: Unused { spans : vec ! [ use_tree. span] , remove : full_span }
292
291
} else {
293
292
UnusedSpanResult :: Used
294
293
}
295
294
}
296
295
ast:: UseTreeKind :: Nested ( ref nested) => {
297
296
if nested. is_empty ( ) {
298
- return UnusedSpanResult :: FlatUnused { span : use_tree. span , remove : full_span } ;
297
+ return UnusedSpanResult :: Unused { spans : vec ! [ use_tree. span] , remove : full_span } ;
299
298
}
300
299
301
300
let mut unused_spans = Vec :: new ( ) ;
@@ -308,15 +307,11 @@ fn calc_unused_spans(
308
307
all_nested_unused = false ;
309
308
None
310
309
}
311
- UnusedSpanResult :: FlatUnused { span, remove } => {
312
- unused_spans. push ( span) ;
313
- Some ( remove)
314
- }
315
- UnusedSpanResult :: NestedFullUnused { mut spans, remove } => {
310
+ UnusedSpanResult :: Unused { mut spans, remove } => {
316
311
unused_spans. append ( & mut spans) ;
317
312
Some ( remove)
318
313
}
319
- UnusedSpanResult :: NestedPartialUnused { mut spans, remove : mut to_remove_extra } => {
314
+ UnusedSpanResult :: PartialUnused { mut spans, remove : mut to_remove_extra } => {
320
315
all_nested_unused = false ;
321
316
unused_spans. append ( & mut spans) ;
322
317
to_remove. append ( & mut to_remove_extra) ;
@@ -349,9 +344,9 @@ fn calc_unused_spans(
349
344
if unused_spans. is_empty ( ) {
350
345
UnusedSpanResult :: Used
351
346
} else if all_nested_unused {
352
- UnusedSpanResult :: NestedFullUnused { spans : unused_spans, remove : full_span }
347
+ UnusedSpanResult :: Unused { spans : unused_spans, remove : full_span }
353
348
} else {
354
- UnusedSpanResult :: NestedPartialUnused { spans : unused_spans, remove : to_remove }
349
+ UnusedSpanResult :: PartialUnused { spans : unused_spans, remove : to_remove }
355
350
}
356
351
}
357
352
}
@@ -417,15 +412,11 @@ impl Resolver<'_, '_> {
417
412
let mut fixes = Vec :: new ( ) ;
418
413
let spans = match calc_unused_spans ( unused, & unused. use_tree , unused. use_tree_id ) {
419
414
UnusedSpanResult :: Used => continue ,
420
- UnusedSpanResult :: FlatUnused { span, remove } => {
421
- fixes. push ( ( remove, String :: new ( ) ) ) ;
422
- vec ! [ span]
423
- }
424
- UnusedSpanResult :: NestedFullUnused { spans, remove } => {
415
+ UnusedSpanResult :: Unused { spans, remove } => {
425
416
fixes. push ( ( remove, String :: new ( ) ) ) ;
426
417
spans
427
418
}
428
- UnusedSpanResult :: NestedPartialUnused { spans, remove } => {
419
+ UnusedSpanResult :: PartialUnused { spans, remove } => {
429
420
for fix in & remove {
430
421
fixes. push ( ( * fix, String :: new ( ) ) ) ;
431
422
}
0 commit comments