@@ -370,7 +370,7 @@ impl<S: Stage> NoArgsAttributeParser<S> for NoMangleParser {
370
370
pub ( crate ) struct UsedParser {
371
371
first_compiler : Option < Span > ,
372
372
first_linker : Option < Span > ,
373
- first_generic : Option < Span > ,
373
+ first_default : Option < Span > ,
374
374
}
375
375
376
376
// A custom `AttributeParser` is used rather than a Simple attribute parser because
@@ -383,7 +383,7 @@ impl<S: Stage> AttributeParser<S> for UsedParser {
383
383
template ! ( Word , List : & [ "compiler" , "linker" ] ) ,
384
384
|group : & mut Self , cx, args| {
385
385
let used_by = match args {
386
- ArgParser :: NoArgs => UsedBy :: Any ,
386
+ ArgParser :: NoArgs => UsedBy :: Default ,
387
387
ArgParser :: List ( list) => {
388
388
let Some ( l) = list. single ( ) else {
389
389
cx. expected_single_argument ( list. span ) ;
@@ -432,18 +432,18 @@ impl<S: Stage> AttributeParser<S> for UsedParser {
432
432
let target = match used_by {
433
433
UsedBy :: Compiler => & mut group. first_compiler ,
434
434
UsedBy :: Linker => {
435
- if let Some ( prev) = group. first_generic {
435
+ if let Some ( prev) = group. first_default {
436
436
cx. warn_unused_duplicate ( prev, attr_span) ;
437
437
return ;
438
438
}
439
439
& mut group. first_linker
440
440
}
441
- UsedBy :: Any => {
441
+ UsedBy :: Default => {
442
442
if let Some ( prev) = group. first_linker {
443
443
cx. warn_unused_duplicate ( prev, attr_span) ;
444
444
return ;
445
445
}
446
- & mut group. first_generic
446
+ & mut group. first_default
447
447
}
448
448
} ;
449
449
@@ -460,10 +460,10 @@ impl<S: Stage> AttributeParser<S> for UsedParser {
460
460
fn finalize ( self , _cx : & FinalizeContext < ' _ , ' _ , S > ) -> Option < AttributeKind > {
461
461
// If a specific form of `used` is specified, it takes precedence over generic `#[used]`.
462
462
// If both `linker` and `compiler` are specified, use `linker`.
463
- Some ( match ( self . first_compiler , self . first_linker , self . first_generic ) {
463
+ Some ( match ( self . first_compiler , self . first_linker , self . first_default ) {
464
464
( _, Some ( span) , _) => AttributeKind :: Used { used_by : UsedBy :: Linker , span } ,
465
465
( Some ( span) , _, _) => AttributeKind :: Used { used_by : UsedBy :: Compiler , span } ,
466
- ( _, _, Some ( span) ) => AttributeKind :: Used { used_by : UsedBy :: Any , span } ,
466
+ ( _, _, Some ( span) ) => AttributeKind :: Used { used_by : UsedBy :: Default , span } ,
467
467
( None , None , None ) => return None ,
468
468
} )
469
469
}
0 commit comments