Skip to content

Commit 6dfa37f

Browse files
committed
Add hir::Attribute
1 parent f332026 commit 6dfa37f

19 files changed

+90
-95
lines changed

clippy_lints/src/attrs/inline_always.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::INLINE_ALWAYS;
22
use super::utils::is_word;
33
use clippy_utils::diagnostics::span_lint;
4-
use rustc_ast::Attribute;
4+
use rustc_hir::Attribute;
55
use rustc_lint::LateContext;
66
use rustc_span::symbol::Symbol;
77
use rustc_span::{Span, sym};

clippy_lints/src/attrs/should_panic_without_expect.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ use super::{Attribute, SHOULD_PANIC_WITHOUT_EXPECT};
22
use clippy_utils::diagnostics::span_lint_and_sugg;
33
use rustc_ast::token::{Token, TokenKind};
44
use rustc_ast::tokenstream::TokenTree;
5-
use rustc_ast::{AttrArgs, AttrArgsEq, AttrKind};
5+
use rustc_ast::{AttrArgs, AttrKind};
66
use rustc_errors::Applicability;
77
use rustc_lint::EarlyContext;
88
use rustc_span::sym;
99

1010
pub(super) fn check(cx: &EarlyContext<'_>, attr: &Attribute) {
1111
if let AttrKind::Normal(normal_attr) = &attr.kind {
12-
if let AttrArgs::Eq { expr: AttrArgsEq::Ast(_), .. } = &normal_attr.item.args {
12+
if let AttrArgs::Eq { .. } = &normal_attr.item.args {
1313
// `#[should_panic = ".."]` found, good
1414
return;
1515
}

clippy_lints/src/cognitive_complexity.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ use clippy_utils::ty::is_type_diagnostic_item;
55
use clippy_utils::visitors::for_each_expr_without_closures;
66
use clippy_utils::{LimitStack, get_async_fn_body, is_async_fn};
77
use core::ops::ControlFlow;
8-
use rustc_ast::ast::Attribute;
98
use rustc_hir::intravisit::FnKind;
10-
use rustc_hir::{Body, Expr, ExprKind, FnDecl};
9+
use rustc_hir::{Attribute, Body, Expr, ExprKind, FnDecl};
1110
use rustc_lint::{LateContext, LateLintPass, LintContext};
1211
use rustc_session::impl_lint_pass;
1312
use rustc_span::def_id::LocalDefId;

clippy_lints/src/doc/empty_line_after.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use clippy_utils::diagnostics::span_lint_and_then;
22
use clippy_utils::source::{SpanRangeExt, snippet_indent};
33
use clippy_utils::tokenize_with_text;
44
use itertools::Itertools;
5+
use rustc_ast::AttrStyle;
56
use rustc_ast::token::CommentKind;
6-
use rustc_ast::{AttrKind, AttrStyle, Attribute};
77
use rustc_errors::{Applicability, Diag, SuggestionStyle};
8-
use rustc_hir::{ItemKind, Node};
8+
use rustc_hir::{AttrKind, Attribute, ItemKind, Node};
99
use rustc_lexer::TokenKind;
1010
use rustc_lint::LateContext;
1111
use rustc_span::{BytePos, ExpnKind, InnerSpan, Span, SpanData};

clippy_lints/src/doc/include_in_doc_without_cfg.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
22
use clippy_utils::source::snippet_opt;
3-
use rustc_ast::{AttrArgs, AttrArgsEq, AttrKind, AttrStyle, Attribute};
3+
use rustc_ast::{AttrStyle};
44
use rustc_errors::Applicability;
55
use rustc_lint::LateContext;
6-
use rustc_span::sym;
6+
use rustc_hir::{Attribute, AttrKind, AttrArgs};
77

88
use super::DOC_INCLUDE_WITHOUT_CFG;
99

1010
pub fn check(cx: &LateContext<'_>, attrs: &[Attribute]) {
1111
for attr in attrs {
1212
if !attr.span.from_expansion()
13-
&& let AttrKind::Normal(ref normal) = attr.kind
14-
&& normal.item.path == sym::doc
15-
&& let AttrArgs::Eq { expr: AttrArgsEq::Hir(ref meta), .. } = normal.item.args
13+
&& let AttrKind::Normal(ref item) = attr.kind
14+
&& attr.doc_str().is_some()
15+
&& let AttrArgs::Eq { expr: meta, .. } = &item.args
1616
&& !attr.span.contains(meta.span)
1717
// Since the `include_str` is already expanded at this point, we can only take the
1818
// whole attribute snippet and then modify for our suggestion.

clippy_lints/src/doc/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ use pulldown_cmark::Event::{
1616
};
1717
use pulldown_cmark::Tag::{BlockQuote, CodeBlock, FootnoteDefinition, Heading, Item, Link, Paragraph};
1818
use pulldown_cmark::{BrokenLink, CodeBlockKind, CowStr, Options, TagEnd};
19-
use rustc_ast::ast::Attribute;
2019
use rustc_data_structures::fx::FxHashSet;
2120
use rustc_hir::intravisit::{self, Visitor};
22-
use rustc_hir::{AnonConst, Expr, ImplItemKind, ItemKind, Node, Safety, TraitItemKind};
21+
use rustc_hir::{AnonConst, Attribute, Expr, ImplItemKind, ItemKind, Node, Safety, TraitItemKind};
2322
use rustc_lint::{LateContext, LateLintPass, LintContext};
2423
use rustc_middle::hir::nested_filter;
2524
use rustc_middle::lint::in_external_macro;

clippy_lints/src/doc/suspicious_doc_comments.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
2+
use rustc_ast::AttrStyle;
23
use rustc_ast::token::CommentKind;
3-
use rustc_ast::{AttrKind, AttrStyle, Attribute};
44
use rustc_errors::Applicability;
5+
use rustc_hir::Attribute;
56
use rustc_lint::LateContext;
67
use rustc_span::Span;
78

@@ -35,7 +36,7 @@ fn collect_doc_replacements(attrs: &[Attribute]) -> Vec<(Span, String)> {
3536
attrs
3637
.iter()
3738
.filter_map(|attr| {
38-
if let AttrKind::DocComment(com_kind, sym) = attr.kind
39+
if let Some((sym, com_kind)) = attr.doc_str_and_comment_kind()
3940
&& let AttrStyle::Outer = attr.style
4041
&& let Some(com) = sym.as_str().strip_prefix('!')
4142
{

clippy_lints/src/doc/too_long_first_doc_paragraph.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
use rustc_ast::ast::Attribute;
21
use rustc_errors::Applicability;
3-
use rustc_hir::{Item, ItemKind};
2+
use rustc_hir::{Attribute, Item, ItemKind};
43
use rustc_lint::LateContext;
54

65
use clippy_utils::diagnostics::span_lint_and_then;

clippy_lints/src/functions/must_use.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
use hir::FnSig;
2-
use rustc_ast::ast::Attribute;
32
use rustc_errors::Applicability;
43
use rustc_hir::def::Res;
54
use rustc_hir::def_id::DefIdSet;
6-
use rustc_hir::{self as hir, QPath};
5+
use rustc_hir::{self as hir, Attribute, QPath};
76
use rustc_infer::infer::TyCtxtInferExt;
87
use rustc_lint::{LateContext, LintContext};
98
use rustc_middle::lint::in_external_macro;

clippy_lints/src/large_include_file.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use clippy_config::Conf;
22
use clippy_utils::diagnostics::span_lint_and_then;
33
use clippy_utils::macros::root_macro_call_first_node;
44
use clippy_utils::source::snippet_opt;
5-
use rustc_ast::{AttrArgs, AttrArgsEq, AttrKind, Attribute, LitKind};
6-
use rustc_hir::{Expr, ExprKind};
5+
use rustc_ast::{LitKind};
6+
use rustc_hir::{Expr, ExprKind, Attribute, AttrArgs, AttrKind};
77
use rustc_lint::{LateContext, LateLintPass};
88
use rustc_session::impl_lint_pass;
99
use rustc_span::{Span, sym};
@@ -93,10 +93,10 @@ impl LateLintPass<'_> for LargeIncludeFile {
9393
if !attr.span.from_expansion()
9494
// Currently, rustc limits the usage of macro at the top-level of attributes,
9595
// so we don't need to recurse into each level.
96-
&& let AttrKind::Normal(ref normal) = attr.kind
96+
&& let AttrKind::Normal(ref item) = attr.kind
9797
&& let Some(doc) = attr.doc_str()
9898
&& doc.as_str().len() as u64 > self.max_file_size
99-
&& let AttrArgs::Eq { expr: AttrArgsEq::Hir(ref meta), .. } = normal.item.args
99+
&& let AttrArgs::Eq { expr: meta, .. } = &item.args
100100
&& !attr.span.contains(meta.span)
101101
// Since the `include_str` is already expanded at this point, we can only take the
102102
// whole attribute snippet and then modify for our suggestion.

0 commit comments

Comments
 (0)