Skip to content

Commit dd2af14

Browse files
committed
Remove hir::TraitItem::attrs.
1 parent c3a17db commit dd2af14

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

clippy_lints/src/attrs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ impl<'tcx> LateLintPass<'tcx> for Attributes {
359359

360360
fn check_trait_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx TraitItem<'_>) {
361361
if is_relevant_trait(cx, item) {
362-
check_attrs(cx, item.span, item.ident.name, &item.attrs)
362+
check_attrs(cx, item.span, item.ident.name, cx.tcx.hir().attrs(item.hir_id()))
363363
}
364364
}
365365
}

clippy_lints/src/doc.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ impl<'tcx> LateLintPass<'tcx> for DocMarkdown {
250250
}
251251

252252
fn check_trait_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx hir::TraitItem<'_>) {
253-
let headers = check_attrs(cx, &self.valid_idents, &item.attrs);
253+
let attrs = cx.tcx.hir().attrs(item.hir_id());
254+
let headers = check_attrs(cx, &self.valid_idents, attrs);
254255
if let hir::TraitItemKind::Fn(ref sig, ..) = item.kind {
255256
if !in_external_macro(cx.tcx.sess, item.span) {
256257
lint_for_missing_headers(cx, item.hir_id(), item.span, sig, headers, None, None);

clippy_lints/src/functions.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -344,15 +344,16 @@ impl<'tcx> LateLintPass<'tcx> for Functions {
344344
check_result_unit_err(cx, &sig.decl, item.span, fn_header_span);
345345
}
346346

347-
let attr = must_use_attr(&item.attrs);
347+
let attrs = cx.tcx.hir().attrs(item.hir_id());
348+
let attr = must_use_attr(attrs);
348349
if let Some(attr) = attr {
349350
check_needless_must_use(cx, &sig.decl, item.hir_id(), item.span, fn_header_span, attr);
350351
}
351352
if let hir::TraitFn::Provided(eid) = *eid {
352353
let body = cx.tcx.hir().body(eid);
353354
Self::check_raw_ptr(cx, sig.header.unsafety, &sig.decl, body, item.hir_id());
354355

355-
if attr.is_none() && is_public && !is_proc_macro(cx.sess(), &item.attrs) {
356+
if attr.is_none() && is_public && !is_proc_macro(cx.sess(), attrs) {
356357
check_must_use_candidate(
357358
cx,
358359
&sig.decl,

clippy_lints/src/inline_fn_without_body.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ declare_lint_pass!(InlineFnWithoutBody => [INLINE_FN_WITHOUT_BODY]);
3434
impl<'tcx> LateLintPass<'tcx> for InlineFnWithoutBody {
3535
fn check_trait_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx TraitItem<'_>) {
3636
if let TraitItemKind::Fn(_, TraitFn::Required(_)) = item.kind {
37-
check_attrs(cx, item.ident.name, &item.attrs);
37+
let attrs = cx.tcx.hir().attrs(item.hir_id());
38+
check_attrs(cx, item.ident.name, attrs);
3839
}
3940
}
4041
}

clippy_lints/src/missing_doc.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
167167
fn check_trait_item(&mut self, cx: &LateContext<'tcx>, trait_item: &'tcx hir::TraitItem<'_>) {
168168
let (article, desc) = cx.tcx.article_and_description(trait_item.def_id.to_def_id());
169169

170-
self.check_missing_docs_attrs(cx, &trait_item.attrs, trait_item.span, article, desc);
170+
let attrs = cx.tcx.hir().attrs(trait_item.hir_id());
171+
self.check_missing_docs_attrs(cx, attrs, trait_item.span, article, desc);
171172
}
172173

173174
fn check_impl_item(&mut self, cx: &LateContext<'tcx>, impl_item: &'tcx hir::ImplItem<'_>) {

clippy_lints/src/missing_inline.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
108108
// an impl is not provided
109109
let desc = "a default trait method";
110110
let item = cx.tcx.hir().trait_item(tit.id);
111-
check_missing_inline_attrs(cx, &item.attrs, item.span, desc);
111+
let attrs = cx.tcx.hir().attrs(item.hir_id());
112+
check_missing_inline_attrs(cx, attrs, item.span, desc);
112113
}
113114
},
114115
}

0 commit comments

Comments
 (0)