@@ -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 ;
@@ -349,12 +349,8 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
349
349
}
350
350
351
351
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 } ) ;
358
354
}
359
355
360
356
/// Checks if `#[diagnostic::do_not_recommend]` is applied on a trait impl.
@@ -1421,12 +1417,10 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
1421
1417
_ => {
1422
1418
// FIXME: #[cold] was previously allowed on non-functions and some crates used
1423
1419
// this, so only emit a warning.
1424
- self . tcx . emit_node_span_lint (
1425
- UNUSED_ATTRIBUTES ,
1426
- hir_id,
1427
- attr. span ,
1428
- errors:: Cold { span, on_crate : hir_id == CRATE_HIR_ID } ,
1429
- ) ;
1420
+ self . tcx . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: Cold {
1421
+ span,
1422
+ on_crate : hir_id == CRATE_HIR_ID ,
1423
+ } ) ;
1430
1424
}
1431
1425
}
1432
1426
}
@@ -1441,12 +1435,9 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
1441
1435
return ;
1442
1436
}
1443
1437
1444
- self . tcx . emit_node_span_lint (
1445
- UNUSED_ATTRIBUTES ,
1446
- hir_id,
1447
- attr. span ,
1448
- errors:: Link { span : ( target != Target :: ForeignMod ) . then_some ( span) } ,
1449
- ) ;
1438
+ self . tcx . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: Link {
1439
+ span : ( target != Target :: ForeignMod ) . then_some ( span) ,
1440
+ } ) ;
1450
1441
}
1451
1442
1452
1443
/// Checks if `#[link_name]` is applied to an item other than a foreign function or static.
@@ -1916,11 +1907,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
1916
1907
|| ( int_reprs == 1
1917
1908
&& is_c
1918
1909
&& item. is_some_and ( |item| {
1919
- if let ItemLike :: Item ( item) = item {
1920
- is_c_like_enum ( item)
1921
- } else {
1922
- false
1923
- }
1910
+ if let ItemLike :: Item ( item) = item { is_c_like_enum ( item) } else { false }
1924
1911
} ) )
1925
1912
{
1926
1913
self . tcx . emit_node_span_lint (
@@ -2260,12 +2247,10 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
2260
2247
return ;
2261
2248
} ;
2262
2249
2263
- self . tcx . emit_node_span_lint (
2264
- UNUSED_ATTRIBUTES ,
2265
- hir_id,
2266
- attr. span ,
2267
- errors:: Unused { attr_span : attr. span , note } ,
2268
- ) ;
2250
+ self . tcx . emit_node_span_lint ( UNUSED_ATTRIBUTES , hir_id, attr. span , errors:: Unused {
2251
+ attr_span : attr. span ,
2252
+ note,
2253
+ } ) ;
2269
2254
}
2270
2255
2271
2256
/// A best effort attempt to create an error for a mismatching proc macro signature.
0 commit comments