@@ -1318,8 +1318,6 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
1318
1318
&& let hir:: IsAsync :: NotAsync = self . tcx . asyncness ( lifetime_ref. hir_id . owner . def_id )
1319
1319
&& !self . tcx . features ( ) . anonymous_lifetime_in_impl_trait
1320
1320
{
1321
-
1322
-
1323
1321
let mut diag = rustc_session:: parse:: feature_err (
1324
1322
& self . tcx . sess . parse_sess ,
1325
1323
sym:: anonymous_lifetime_in_impl_trait,
@@ -1330,18 +1328,14 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
1330
1328
match self . tcx . hir ( ) . get_generics ( lifetime_ref. hir_id . owner . def_id ) {
1331
1329
Some ( generics) => {
1332
1330
1333
- let mut new_param_sugg_tuple = None ;
1334
-
1335
- for i in 0 ..generics. params . len ( ) {
1336
- if !generics. span . contains ( generics. params [ i] . span ) {
1337
- new_param_sugg_tuple = match generics. span_for_param_suggestion ( ) {
1338
- Some ( _) => {
1339
- Some ( ( self . tcx . sess . source_map ( ) . span_through_char ( generics. span , '<' ) . shrink_to_hi ( ) , "'a, " . to_owned ( ) ) )
1340
- } ,
1341
- None => Some ( ( generics. span , "<'a>" . to_owned ( ) ) )
1342
- }
1343
- }
1344
- }
1331
+ let new_param_sugg_tuple;
1332
+
1333
+ new_param_sugg_tuple = match generics. span_for_param_suggestion ( ) {
1334
+ Some ( _) => {
1335
+ Some ( ( self . tcx . sess . source_map ( ) . span_through_char ( generics. span , '<' ) . shrink_to_hi ( ) , "'a, " . to_owned ( ) ) )
1336
+ } ,
1337
+ None => Some ( ( generics. span , "<'a>" . to_owned ( ) ) )
1338
+ } ;
1345
1339
1346
1340
let mut multi_sugg_vec = vec ! [ ( lifetime_ref. span. shrink_to_hi( ) , "'a " . to_owned( ) ) ] ;
1347
1341
@@ -1355,12 +1349,11 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
1355
1349
rustc_errors:: Applicability :: MaybeIncorrect ) ;
1356
1350
1357
1351
} ,
1358
- None => { continue ; }
1352
+ None => { }
1359
1353
}
1360
1354
1361
1355
diag. emit ( ) ;
1362
1356
return ;
1363
-
1364
1357
}
1365
1358
scope = s;
1366
1359
}
0 commit comments