@@ -10,16 +10,16 @@ use std::collections::hash_map::Entry;
1010use rustc_ast:: token:: TokenKind ;
1111use rustc_ast:: tokenstream:: TokenTree ;
1212use rustc_ast:: {
13- ast , AttrKind , AttrStyle , Attribute , LitKind , MetaItemInner , MetaItemKind , MetaItemLit ,
13+ AttrKind , AttrStyle , Attribute , LitKind , MetaItemInner , MetaItemKind , MetaItemLit , ast ,
1414} ;
1515use rustc_data_structures:: fx:: FxHashMap ;
1616use 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 } ;
1818use rustc_hir:: def_id:: LocalModDefId ;
1919use rustc_hir:: intravisit:: { self , Visitor } ;
2020use rustc_hir:: {
21- self as hir, self , FnSig , ForeignItem , HirId , Item , ItemKind , MethodKind , Safety , Target ,
22- TraitItem , CRATE_HIR_ID , CRATE_OWNER_ID ,
21+ self as hir, self , CRATE_HIR_ID , CRATE_OWNER_ID , FnSig , ForeignItem , HirId , Item , ItemKind ,
22+ MethodKind , Safety , Target , TraitItem ,
2323} ;
2424use rustc_macros:: LintDiagnostic ;
2525use rustc_middle:: hir:: nested_filter;
@@ -34,8 +34,8 @@ use rustc_session::lint::builtin::{
3434 UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES , UNUSED_ATTRIBUTES ,
3535} ;
3636use 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 } ;
3939use rustc_target:: abi:: Size ;
4040use rustc_target:: spec:: abi:: Abi ;
4141use rustc_trait_selection:: error_reporting:: InferCtxtErrorExt ;
@@ -349,12 +349,8 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
349349 }
350350
351351 fn inline_attr_str_error_without_macro_def ( & self , hir_id : HirId , attr : & Attribute , sym : & str ) {
352- self . tcx . emit_node_span_lint (
353- UNUSED_ATTRIBUTES ,
354- hir_id,
355- attr. span ,
356- errors:: IgnoredAttr { sym } ,
357- ) ;
352+ self . tcx
353+ . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: IgnoredAttr { sym } ) ;
358354 }
359355
360356 /// Checks if `#[diagnostic::do_not_recommend]` is applied on a trait impl.
@@ -1398,12 +1394,10 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
13981394 _ => {
13991395 // FIXME: #[cold] was previously allowed on non-functions and some crates used
14001396 // this, so only emit a warning.
1401- self . tcx . emit_node_span_lint (
1402- UNUSED_ATTRIBUTES ,
1403- hir_id,
1404- attr. span ,
1405- errors:: Cold { span, on_crate : hir_id == CRATE_HIR_ID } ,
1406- ) ;
1397+ self . tcx . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: Cold {
1398+ span,
1399+ on_crate : hir_id == CRATE_HIR_ID ,
1400+ } ) ;
14071401 }
14081402 }
14091403 }
@@ -1418,12 +1412,9 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
14181412 return ;
14191413 }
14201414
1421- self . tcx . emit_node_span_lint (
1422- UNUSED_ATTRIBUTES ,
1423- hir_id,
1424- attr. span ,
1425- errors:: Link { span : ( target != Target :: ForeignMod ) . then_some ( span) } ,
1426- ) ;
1415+ self . tcx . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: Link {
1416+ span : ( target != Target :: ForeignMod ) . then_some ( span) ,
1417+ } ) ;
14271418 }
14281419
14291420 /// Checks if `#[link_name]` is applied to an item other than a foreign function or static.
@@ -1893,11 +1884,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
18931884 || ( int_reprs == 1
18941885 && is_c
18951886 && item. is_some_and ( |item| {
1896- if let ItemLike :: Item ( item) = item {
1897- is_c_like_enum ( item)
1898- } else {
1899- false
1900- }
1887+ if let ItemLike :: Item ( item) = item { is_c_like_enum ( item) } else { false }
19011888 } ) )
19021889 {
19031890 self . tcx . emit_node_span_lint (
@@ -2237,12 +2224,10 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
22372224 return ;
22382225 } ;
22392226
2240- self . tcx . emit_node_span_lint (
2241- UNUSED_ATTRIBUTES ,
2242- hir_id,
2243- attr. span ,
2244- errors:: Unused { attr_span : attr. span , note } ,
2245- ) ;
2227+ self . tcx . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: Unused {
2228+ attr_span : attr. span ,
2229+ note,
2230+ } ) ;
22462231 }
22472232
22482233 /// A best effort attempt to create an error for a mismatching proc macro signature.
0 commit comments