squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Access attrs directly from HirId in rustc_lint::builtin.

Browse source
This commit is contained in:
Camille GILLOT 2020-11-27 00:05:29 +01:00
parent 260aa9f554
commit 662f11ade6
1 changed files with 10 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
compiler/rustc_lint/src/builtin.rs
View file

@ -508,8 +508,7 @@ impl MissingDoc {
fn check_missing_docs_attrs( fn check_missing_docs_attrs(
&self, &self,
cx: &LateContext<'_>, cx: &LateContext<'_>,
id: Option<hir::HirId>, id: hir::HirId,
attrs: &[ast::Attribute],
sp: Span, sp: Span,
article: &'static str, article: &'static str,
desc: &'static str, desc: &'static str,
@ -528,12 +527,13 @@ impl MissingDoc {
// Only check publicly-visible items, using the result from the privacy pass. // Only check publicly-visible items, using the result from the privacy pass.
// It's an option so the crate root can also use this function (it doesn't // It's an option so the crate root can also use this function (it doesn't
// have a `NodeId`). // have a `NodeId`).
if let Some(id) = id { if id != hir::CRATE_HIR_ID {
if !cx.access_levels.is_exported(id) { if !cx.access_levels.is_exported(id) {
return; return;
} }
} }
let attrs = cx.tcx.hir().attrs(id);
let has_doc = attrs.iter().any(|a| has_doc(cx.sess(), a)); let has_doc = attrs.iter().any(|a| has_doc(cx.sess(), a));
if !has_doc { if !has_doc {
cx.struct_span_lint( cx.struct_span_lint(
@ -565,7 +565,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
} }
fn check_crate(&mut self, cx: &LateContext<'_>, krate: &hir::Crate<'_>) { fn check_crate(&mut self, cx: &LateContext<'_>, krate: &hir::Crate<'_>) {
self.check_missing_docs_attrs(cx, None, &krate.item.attrs, krate.item.span, "the", "crate"); self.check_missing_docs_attrs(cx, hir::CRATE_HIR_ID, krate.item.span, "the", "crate");
for macro_def in krate.exported_macros { for macro_def in krate.exported_macros {
let has_doc = macro_def.attrs.iter().any(|a| has_doc(cx.sess(), a)); let has_doc = macro_def.attrs.iter().any(|a| has_doc(cx.sess(), a));
@ -622,7 +622,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
let (article, desc) = cx.tcx.article_and_description(it.def_id.to_def_id()); let (article, desc) = cx.tcx.article_and_description(it.def_id.to_def_id());
self.check_missing_docs_attrs(cx, Some(it.hir_id()), &it.attrs, it.span, article, desc); self.check_missing_docs_attrs(cx, it.hir_id(), it.span, article, desc);
} }
fn check_trait_item(&mut self, cx: &LateContext<'_>, trait_item: &hir::TraitItem<'_>) { fn check_trait_item(&mut self, cx: &LateContext<'_>, trait_item: &hir::TraitItem<'_>) {
@ -632,14 +632,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
let (article, desc) = cx.tcx.article_and_description(trait_item.def_id.to_def_id()); let (article, desc) = cx.tcx.article_and_description(trait_item.def_id.to_def_id());
self.check_missing_docs_attrs( self.check_missing_docs_attrs(cx, trait_item.hir_id(), trait_item.span, article, desc);
cx,
Some(trait_item.hir_id()),
&trait_item.attrs,
trait_item.span,
article,
desc,
);
} }
fn check_impl_item(&mut self, cx: &LateContext<'_>, impl_item: &hir::ImplItem<'_>) { fn check_impl_item(&mut self, cx: &LateContext<'_>, impl_item: &hir::ImplItem<'_>) {
@ -649,43 +642,22 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
} }
let (article, desc) = cx.tcx.article_and_description(impl_item.def_id.to_def_id()); let (article, desc) = cx.tcx.article_and_description(impl_item.def_id.to_def_id());
self.check_missing_docs_attrs( self.check_missing_docs_attrs(cx, impl_item.hir_id(), impl_item.span, article, desc);
cx,
Some(impl_item.hir_id()),
&impl_item.attrs,
impl_item.span,
article,
desc,
);
} }
fn check_foreign_item(&mut self, cx: &LateContext<'_>, foreign_item: &hir::ForeignItem<'_>) { fn check_foreign_item(&mut self, cx: &LateContext<'_>, foreign_item: &hir::ForeignItem<'_>) {
let (article, desc) = cx.tcx.article_and_description(foreign_item.def_id.to_def_id()); let (article, desc) = cx.tcx.article_and_description(foreign_item.def_id.to_def_id());
self.check_missing_docs_attrs( self.check_missing_docs_attrs(cx, foreign_item.hir_id(), foreign_item.span, article, desc);
cx,
Some(foreign_item.hir_id()),
&foreign_item.attrs,
foreign_item.span,
article,
desc,
);
} }
fn check_struct_field(&mut self, cx: &LateContext<'_>, sf: &hir::StructField<'_>) { fn check_struct_field(&mut self, cx: &LateContext<'_>, sf: &hir::StructField<'_>) {
if !sf.is_positional() { if !sf.is_positional() {
self.check_missing_docs_attrs( self.check_missing_docs_attrs(cx, sf.hir_id, sf.span, "a", "struct field")
cx,
Some(sf.hir_id),
&sf.attrs,
sf.span,
"a",
"struct field",
)
} }
} }
fn check_variant(&mut self, cx: &LateContext<'_>, v: &hir::Variant<'_>) { fn check_variant(&mut self, cx: &LateContext<'_>, v: &hir::Variant<'_>) {
self.check_missing_docs_attrs(cx, Some(v.id), &v.attrs, v.span, "a", "variant"); self.check_missing_docs_attrs(cx, v.id, v.span, "a", "variant");
} }
} }