@@ -10,16 +10,16 @@ use std::collections::hash_map::Entry;
10
10
use rustc_ast:: token:: TokenKind ;
11
11
use rustc_ast:: tokenstream:: TokenTree ;
12
12
use rustc_ast:: {
13
- ast , AttrKind , AttrStyle , Attribute , LitKind , MetaItemInner , MetaItemKind , MetaItemLit ,
13
+ AttrKind , AttrStyle , Attribute , LitKind , MetaItemInner , MetaItemKind , MetaItemLit , ast ,
14
14
} ;
15
15
use rustc_data_structures:: fx:: FxHashMap ;
16
16
use rustc_errors:: { Applicability , DiagCtxtHandle , IntoDiagArg , MultiSpan , StashKey } ;
17
- use rustc_feature:: { AttributeDuplicates , AttributeType , BuiltinAttribute , BUILTIN_ATTRIBUTE_MAP } ;
17
+ use rustc_feature:: { AttributeDuplicates , AttributeType , BUILTIN_ATTRIBUTE_MAP , BuiltinAttribute } ;
18
18
use rustc_hir:: def_id:: LocalModDefId ;
19
19
use rustc_hir:: intravisit:: { self , Visitor } ;
20
20
use rustc_hir:: {
21
- self , self as hir, AssocItemKind , FnSig , FnSig , ForeignItem , ForeignItem , HirId , Item ,
22
- ItemKind , MethodKind , Safety , Target , Target , TraitItem , CRATE_HIR_ID , CRATE_OWNER_ID ,
21
+ self , self as hir, AssocItemKind , CRATE_HIR_ID , CRATE_OWNER_ID , FnSig , ForeignItem , HirId ,
22
+ Item , ItemKind , MethodKind , Safety , Target , TraitItem ,
23
23
} ;
24
24
use rustc_macros:: LintDiagnostic ;
25
25
use rustc_middle:: hir:: nested_filter;
@@ -34,8 +34,8 @@ use rustc_session::lint::builtin::{
34
34
UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES , UNUSED_ATTRIBUTES ,
35
35
} ;
36
36
use rustc_session:: parse:: feature_err;
37
- use rustc_span:: symbol:: { kw , sym , Symbol } ;
38
- use rustc_span:: { BytePos , Span , DUMMY_SP } ;
37
+ use rustc_span:: symbol:: { Symbol , kw , sym } ;
38
+ use rustc_span:: { BytePos , DUMMY_SP , Span } ;
39
39
use rustc_target:: abi:: Size ;
40
40
use rustc_target:: spec:: abi:: Abi ;
41
41
use rustc_trait_selection:: error_reporting:: InferCtxtErrorExt ;
@@ -352,12 +352,8 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
352
352
}
353
353
354
354
fn inline_attr_str_error_without_macro_def ( & self , hir_id : HirId , attr : & Attribute , sym : & str ) {
355
- self . tcx . emit_node_span_lint (
356
- UNUSED_ATTRIBUTES ,
357
- hir_id,
358
- attr. span ,
359
- errors:: IgnoredAttr { sym } ,
360
- ) ;
355
+ self . tcx
356
+ . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: IgnoredAttr { sym } ) ;
361
357
}
362
358
363
359
/// Checks if `#[diagnostic::do_not_recommend]` is applied on a trait impl.
@@ -1424,12 +1420,10 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
1424
1420
_ => {
1425
1421
// FIXME: #[cold] was previously allowed on non-functions and some crates used
1426
1422
// this, so only emit a warning.
1427
- self . tcx . emit_node_span_lint (
1428
- UNUSED_ATTRIBUTES ,
1429
- hir_id,
1430
- attr. span ,
1431
- errors:: Cold { span, on_crate : hir_id == CRATE_HIR_ID } ,
1432
- ) ;
1423
+ self . tcx . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: Cold {
1424
+ span,
1425
+ on_crate : hir_id == CRATE_HIR_ID ,
1426
+ } ) ;
1433
1427
}
1434
1428
}
1435
1429
}
@@ -1444,12 +1438,9 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
1444
1438
return ;
1445
1439
}
1446
1440
1447
- self . tcx . emit_node_span_lint (
1448
- UNUSED_ATTRIBUTES ,
1449
- hir_id,
1450
- attr. span ,
1451
- errors:: Link { span : ( target != Target :: ForeignMod ) . then_some ( span) } ,
1452
- ) ;
1441
+ self . tcx . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: Link {
1442
+ span : ( target != Target :: ForeignMod ) . then_some ( span) ,
1443
+ } ) ;
1453
1444
}
1454
1445
1455
1446
/// Checks if `#[link_name]` is applied to an item other than a foreign function or static.
@@ -1919,11 +1910,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
1919
1910
|| ( int_reprs == 1
1920
1911
&& is_c
1921
1912
&& item. is_some_and ( |item| {
1922
- if let ItemLike :: Item ( item) = item {
1923
- is_c_like_enum ( item)
1924
- } else {
1925
- false
1926
- }
1913
+ if let ItemLike :: Item ( item) = item { is_c_like_enum ( item) } else { false }
1927
1914
} ) )
1928
1915
{
1929
1916
self . tcx . emit_node_span_lint (
@@ -2263,12 +2250,10 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
2263
2250
return ;
2264
2251
} ;
2265
2252
2266
- self . tcx . emit_node_span_lint (
2267
- UNUSED_ATTRIBUTES ,
2268
- hir_id,
2269
- attr. span ,
2270
- errors:: Unused { attr_span : attr. span , note } ,
2271
- ) ;
2253
+ self . tcx . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: Unused {
2254
+ attr_span : attr. span ,
2255
+ note,
2256
+ } ) ;
2272
2257
}
2273
2258
2274
2259
/// A best effort attempt to create an error for a mismatching proc macro signature.
0 commit comments