Only store a LocalDefId in hir::Item.
Items are guaranteed to be HIR owner.
This commit is contained in:
parent
5b68fc16ed
commit
2dc65397ee
22 changed files with 41 additions and 56 deletions
|
@ -38,7 +38,7 @@ impl<'tcx> LateLintPass<'tcx> for CopyIterator {
|
||||||
..
|
..
|
||||||
}) = item.kind
|
}) = item.kind
|
||||||
{
|
{
|
||||||
let ty = cx.tcx.type_of(cx.tcx.hir().local_def_id(item.hir_id));
|
let ty = cx.tcx.type_of(item.def_id);
|
||||||
|
|
||||||
if is_copy(cx, ty) && match_path(&trait_ref.path, &paths::ITERATOR) {
|
if is_copy(cx, ty) && match_path(&trait_ref.path, &paths::ITERATOR) {
|
||||||
span_lint_and_note(
|
span_lint_and_note(
|
||||||
|
|
|
@ -169,7 +169,7 @@ impl<'tcx> LateLintPass<'tcx> for Derive {
|
||||||
..
|
..
|
||||||
}) = item.kind
|
}) = item.kind
|
||||||
{
|
{
|
||||||
let ty = cx.tcx.type_of(cx.tcx.hir().local_def_id(item.hir_id));
|
let ty = cx.tcx.type_of(item.def_id);
|
||||||
let is_automatically_derived = is_automatically_derived(&*item.attrs);
|
let is_automatically_derived = is_automatically_derived(&*item.attrs);
|
||||||
|
|
||||||
check_hash_peq(cx, item.span, trait_ref, ty, is_automatically_derived);
|
check_hash_peq(cx, item.span, trait_ref, ty, is_automatically_derived);
|
||||||
|
|
|
@ -216,18 +216,17 @@ impl<'tcx> LateLintPass<'tcx> for DocMarkdown {
|
||||||
let headers = check_attrs(cx, &self.valid_idents, &item.attrs);
|
let headers = check_attrs(cx, &self.valid_idents, &item.attrs);
|
||||||
match item.kind {
|
match item.kind {
|
||||||
hir::ItemKind::Fn(ref sig, _, body_id) => {
|
hir::ItemKind::Fn(ref sig, _, body_id) => {
|
||||||
if !(is_entrypoint_fn(cx, cx.tcx.hir().local_def_id(item.hir_id).to_def_id())
|
if !(is_entrypoint_fn(cx, item.def_id.to_def_id())
|
||||||
|| in_external_macro(cx.tcx.sess, item.span))
|
|| in_external_macro(cx.tcx.sess, item.span))
|
||||||
{
|
{
|
||||||
let body = cx.tcx.hir().body(body_id);
|
let body = cx.tcx.hir().body(body_id);
|
||||||
let impl_item_def_id = cx.tcx.hir().local_def_id(item.hir_id);
|
|
||||||
let mut fpu = FindPanicUnwrap {
|
let mut fpu = FindPanicUnwrap {
|
||||||
cx,
|
cx,
|
||||||
typeck_results: cx.tcx.typeck(impl_item_def_id),
|
typeck_results: cx.tcx.typeck(item.def_id),
|
||||||
panic_span: None,
|
panic_span: None,
|
||||||
};
|
};
|
||||||
fpu.visit_expr(&body.value);
|
fpu.visit_expr(&body.value);
|
||||||
lint_for_missing_headers(cx, item.hir_id, item.span, sig, headers, Some(body_id), fpu.panic_span);
|
lint_for_missing_headers(cx, item.hir_id(), item.span, sig, headers, Some(body_id), fpu.panic_span);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
hir::ItemKind::Impl(ref impl_) => {
|
hir::ItemKind::Impl(ref impl_) => {
|
||||||
|
|
|
@ -49,9 +49,8 @@ impl<'tcx> LateLintPass<'tcx> for EmptyEnum {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let did = cx.tcx.hir().local_def_id(item.hir_id);
|
|
||||||
if let ItemKind::Enum(..) = item.kind {
|
if let ItemKind::Enum(..) = item.kind {
|
||||||
let ty = cx.tcx.type_of(did);
|
let ty = cx.tcx.type_of(item.def_id);
|
||||||
let adt = ty.ty_adt_def().expect("already checked whether this is an enum");
|
let adt = ty.ty_adt_def().expect("already checked whether this is an enum");
|
||||||
if adt.variants.is_empty() {
|
if adt.variants.is_empty() {
|
||||||
span_lint_and_help(
|
span_lint_and_help(
|
||||||
|
|
|
@ -72,7 +72,7 @@ impl LateLintPass<'_> for ExhaustiveItems {
|
||||||
fn check_item(&mut self, cx: &LateContext<'_>, item: &Item<'_>) {
|
fn check_item(&mut self, cx: &LateContext<'_>, item: &Item<'_>) {
|
||||||
if_chain! {
|
if_chain! {
|
||||||
if let ItemKind::Enum(..) | ItemKind::Struct(..) = item.kind;
|
if let ItemKind::Enum(..) | ItemKind::Struct(..) = item.kind;
|
||||||
if cx.access_levels.is_exported(item.hir_id);
|
if cx.access_levels.is_exported(item.hir_id());
|
||||||
if !item.attrs.iter().any(|a| a.has_name(sym::non_exhaustive));
|
if !item.attrs.iter().any(|a| a.has_name(sym::non_exhaustive));
|
||||||
then {
|
then {
|
||||||
let (lint, msg) = if let ItemKind::Struct(ref v, ..) = item.kind {
|
let (lint, msg) = if let ItemKind::Struct(ref v, ..) = item.kind {
|
||||||
|
|
|
@ -52,10 +52,9 @@ declare_lint_pass!(FallibleImplFrom => [FALLIBLE_IMPL_FROM]);
|
||||||
impl<'tcx> LateLintPass<'tcx> for FallibleImplFrom {
|
impl<'tcx> LateLintPass<'tcx> for FallibleImplFrom {
|
||||||
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx hir::Item<'_>) {
|
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx hir::Item<'_>) {
|
||||||
// check for `impl From<???> for ..`
|
// check for `impl From<???> for ..`
|
||||||
let impl_def_id = cx.tcx.hir().local_def_id(item.hir_id);
|
|
||||||
if_chain! {
|
if_chain! {
|
||||||
if let hir::ItemKind::Impl(impl_) = &item.kind;
|
if let hir::ItemKind::Impl(impl_) = &item.kind;
|
||||||
if let Some(impl_trait_ref) = cx.tcx.impl_trait_ref(impl_def_id);
|
if let Some(impl_trait_ref) = cx.tcx.impl_trait_ref(item.def_id);
|
||||||
if cx.tcx.is_diagnostic_item(sym::from_trait, impl_trait_ref.def_id);
|
if cx.tcx.is_diagnostic_item(sym::from_trait, impl_trait_ref.def_id);
|
||||||
then {
|
then {
|
||||||
lint_impl_body(cx, item.span, impl_.items);
|
lint_impl_body(cx, item.span, impl_.items);
|
||||||
|
|
|
@ -60,10 +60,9 @@ impl LateLintPass<'_> for FromOverInto {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let impl_def_id = cx.tcx.hir().local_def_id(item.hir_id);
|
|
||||||
if_chain! {
|
if_chain! {
|
||||||
if let hir::ItemKind::Impl{ .. } = &item.kind;
|
if let hir::ItemKind::Impl{ .. } = &item.kind;
|
||||||
if let Some(impl_trait_ref) = cx.tcx.impl_trait_ref(impl_def_id);
|
if let Some(impl_trait_ref) = cx.tcx.impl_trait_ref(item.def_id);
|
||||||
if match_def_path(cx, impl_trait_ref.def_id, &INTO);
|
if match_def_path(cx, impl_trait_ref.def_id, &INTO);
|
||||||
|
|
||||||
then {
|
then {
|
||||||
|
|
|
@ -283,13 +283,13 @@ impl<'tcx> LateLintPass<'tcx> for Functions {
|
||||||
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx hir::Item<'_>) {
|
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx hir::Item<'_>) {
|
||||||
let attr = must_use_attr(&item.attrs);
|
let attr = must_use_attr(&item.attrs);
|
||||||
if let hir::ItemKind::Fn(ref sig, ref _generics, ref body_id) = item.kind {
|
if let hir::ItemKind::Fn(ref sig, ref _generics, ref body_id) = item.kind {
|
||||||
let is_public = cx.access_levels.is_exported(item.hir_id);
|
let is_public = cx.access_levels.is_exported(item.hir_id());
|
||||||
let fn_header_span = item.span.with_hi(sig.decl.output.span().hi());
|
let fn_header_span = item.span.with_hi(sig.decl.output.span().hi());
|
||||||
if is_public {
|
if is_public {
|
||||||
check_result_unit_err(cx, &sig.decl, item.span, fn_header_span);
|
check_result_unit_err(cx, &sig.decl, item.span, fn_header_span);
|
||||||
}
|
}
|
||||||
if let Some(attr) = attr {
|
if let Some(attr) = attr {
|
||||||
check_needless_must_use(cx, &sig.decl, item.hir_id, item.span, fn_header_span, attr);
|
check_needless_must_use(cx, &sig.decl, item.hir_id(), item.span, fn_header_span, attr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if is_public && !is_proc_macro(cx.sess(), &item.attrs) && attr_by_name(&item.attrs, "no_mangle").is_none() {
|
if is_public && !is_proc_macro(cx.sess(), &item.attrs) && attr_by_name(&item.attrs, "no_mangle").is_none() {
|
||||||
|
@ -298,7 +298,7 @@ impl<'tcx> LateLintPass<'tcx> for Functions {
|
||||||
&sig.decl,
|
&sig.decl,
|
||||||
cx.tcx.hir().body(*body_id),
|
cx.tcx.hir().body(*body_id),
|
||||||
item.span,
|
item.span,
|
||||||
item.hir_id,
|
item.hir_id(),
|
||||||
item.span.with_hi(sig.decl.output.span().hi()),
|
item.span.with_hi(sig.decl.output.span().hi()),
|
||||||
"this function could have a `#[must_use]` attribute",
|
"this function could have a `#[must_use]` attribute",
|
||||||
);
|
);
|
||||||
|
|
|
@ -59,20 +59,15 @@ impl<'tcx> LateLintPass<'tcx> for MultipleInherentImpl {
|
||||||
// but filter out implementations that have generic params (type or lifetime)
|
// but filter out implementations that have generic params (type or lifetime)
|
||||||
// or are derived from a macro
|
// or are derived from a macro
|
||||||
if !in_macro(item.span) && generics.params.is_empty() {
|
if !in_macro(item.span) && generics.params.is_empty() {
|
||||||
self.impls.insert(item.hir_id.owner.to_def_id(), item.span);
|
self.impls.insert(item.def_id.to_def_id(), item.span);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_crate_post(&mut self, cx: &LateContext<'tcx>, krate: &'tcx Crate<'_>) {
|
fn check_crate_post(&mut self, cx: &LateContext<'tcx>, krate: &'tcx Crate<'_>) {
|
||||||
if let Some(item) = krate.items.values().next() {
|
if !krate.items.is_empty() {
|
||||||
// Retrieve all inherent implementations from the crate, grouped by type
|
// Retrieve all inherent implementations from the crate, grouped by type
|
||||||
for impls in cx
|
for impls in cx.tcx.crate_inherent_impls(def_id::LOCAL_CRATE).inherent_impls.values() {
|
||||||
.tcx
|
|
||||||
.crate_inherent_impls(item.hir_id.owner.to_def_id().krate)
|
|
||||||
.inherent_impls
|
|
||||||
.values()
|
|
||||||
{
|
|
||||||
// Filter out implementations that have generic params (type or lifetime)
|
// Filter out implementations that have generic params (type or lifetime)
|
||||||
let mut impl_spans = impls.iter().filter_map(|impl_def| self.impls.get(impl_def));
|
let mut impl_spans = impls.iter().filter_map(|impl_def| self.impls.get(impl_def));
|
||||||
if let Some(initial_span) = impl_spans.next() {
|
if let Some(initial_span) = impl_spans.next() {
|
||||||
|
|
|
@ -62,9 +62,8 @@ impl<'tcx> LateLintPass<'tcx> for LargeEnumVariant {
|
||||||
if in_external_macro(cx.tcx.sess, item.span) {
|
if in_external_macro(cx.tcx.sess, item.span) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let did = cx.tcx.hir().local_def_id(item.hir_id);
|
|
||||||
if let ItemKind::Enum(ref def, _) = item.kind {
|
if let ItemKind::Enum(ref def, _) = item.kind {
|
||||||
let ty = cx.tcx.type_of(did);
|
let ty = cx.tcx.type_of(item.def_id);
|
||||||
let adt = ty.ty_adt_def().expect("already checked whether this is an enum");
|
let adt = ty.ty_adt_def().expect("already checked whether this is an enum");
|
||||||
|
|
||||||
let mut largest_variant: Option<(_, _)> = None;
|
let mut largest_variant: Option<(_, _)> = None;
|
||||||
|
|
|
@ -177,10 +177,9 @@ fn check_trait_items(cx: &LateContext<'_>, visited_trait: &Item<'_>, trait_items
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if cx.access_levels.is_exported(visited_trait.hir_id) && trait_items.iter().any(|i| is_named_self(cx, i, "len")) {
|
if cx.access_levels.is_exported(visited_trait.hir_id()) && trait_items.iter().any(|i| is_named_self(cx, i, "len")) {
|
||||||
let mut current_and_super_traits = FxHashSet::default();
|
let mut current_and_super_traits = FxHashSet::default();
|
||||||
let visited_trait_def_id = cx.tcx.hir().local_def_id(visited_trait.hir_id);
|
fill_trait_set(visited_trait.def_id.to_def_id(), &mut current_and_super_traits, cx);
|
||||||
fill_trait_set(visited_trait_def_id.to_def_id(), &mut current_and_super_traits, cx);
|
|
||||||
|
|
||||||
let is_empty_method_found = current_and_super_traits
|
let is_empty_method_found = current_and_super_traits
|
||||||
.iter()
|
.iter()
|
||||||
|
@ -230,8 +229,7 @@ fn check_impl_items(cx: &LateContext<'_>, item: &Item<'_>, impl_items: &[ImplIte
|
||||||
|
|
||||||
if let Some(i) = impl_items.iter().find(|i| is_named_self(cx, i, "len")) {
|
if let Some(i) = impl_items.iter().find(|i| is_named_self(cx, i, "len")) {
|
||||||
if cx.access_levels.is_exported(i.id.hir_id) {
|
if cx.access_levels.is_exported(i.id.hir_id) {
|
||||||
let def_id = cx.tcx.hir().local_def_id(item.hir_id);
|
let ty = cx.tcx.type_of(item.def_id);
|
||||||
let ty = cx.tcx.type_of(def_id);
|
|
||||||
|
|
||||||
span_lint(
|
span_lint(
|
||||||
cx,
|
cx,
|
||||||
|
|
|
@ -1687,8 +1687,7 @@ impl<'tcx> LateLintPass<'tcx> for Methods {
|
||||||
let name = impl_item.ident.name.as_str();
|
let name = impl_item.ident.name.as_str();
|
||||||
let parent = cx.tcx.hir().get_parent_item(impl_item.hir_id);
|
let parent = cx.tcx.hir().get_parent_item(impl_item.hir_id);
|
||||||
let item = cx.tcx.hir().expect_item(parent);
|
let item = cx.tcx.hir().expect_item(parent);
|
||||||
let def_id = cx.tcx.hir().local_def_id(item.hir_id);
|
let self_ty = cx.tcx.type_of(item.def_id);
|
||||||
let self_ty = cx.tcx.type_of(def_id);
|
|
||||||
|
|
||||||
// if this impl block implements a trait, lint in trait definition instead
|
// if this impl block implements a trait, lint in trait definition instead
|
||||||
if let hir::ItemKind::Impl(hir::Impl { of_trait: Some(_), .. }) = item.kind {
|
if let hir::ItemKind::Impl(hir::Impl { of_trait: Some(_), .. }) = item.kind {
|
||||||
|
|
|
@ -135,8 +135,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
|
||||||
hir::ItemKind::Fn(..) => {
|
hir::ItemKind::Fn(..) => {
|
||||||
// ignore main()
|
// ignore main()
|
||||||
if it.ident.name == sym::main {
|
if it.ident.name == sym::main {
|
||||||
let def_id = it.hir_id.owner;
|
let def_key = cx.tcx.hir().def_key(it.def_id);
|
||||||
let def_key = cx.tcx.hir().def_key(def_id);
|
|
||||||
if def_key.parent == Some(hir::def_id::CRATE_DEF_INDEX) {
|
if def_key.parent == Some(hir::def_id::CRATE_DEF_INDEX) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -159,8 +158,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
|
||||||
| hir::ItemKind::Use(..) => return,
|
| hir::ItemKind::Use(..) => return,
|
||||||
};
|
};
|
||||||
|
|
||||||
let def_id = cx.tcx.hir().local_def_id(it.hir_id);
|
let (article, desc) = cx.tcx.article_and_description(it.def_id.to_def_id());
|
||||||
let (article, desc) = cx.tcx.article_and_description(def_id.to_def_id());
|
|
||||||
|
|
||||||
self.check_missing_docs_attrs(cx, &it.attrs, it.span, article, desc);
|
self.check_missing_docs_attrs(cx, &it.attrs, it.span, article, desc);
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,7 +87,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if !cx.access_levels.is_exported(it.hir_id) {
|
if !cx.access_levels.is_exported(it.hir_id()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
match it.kind {
|
match it.kind {
|
||||||
|
|
|
@ -57,7 +57,7 @@ declare_lint_pass!(MutableKeyType => [ MUTABLE_KEY_TYPE ]);
|
||||||
impl<'tcx> LateLintPass<'tcx> for MutableKeyType {
|
impl<'tcx> LateLintPass<'tcx> for MutableKeyType {
|
||||||
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx hir::Item<'tcx>) {
|
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx hir::Item<'tcx>) {
|
||||||
if let hir::ItemKind::Fn(ref sig, ..) = item.kind {
|
if let hir::ItemKind::Fn(ref sig, ..) = item.kind {
|
||||||
check_sig(cx, item.hir_id, &sig.decl);
|
check_sig(cx, item.hir_id(), &sig.decl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,11 +5,12 @@
|
||||||
use crate::utils::{is_automatically_derived, snippet_opt, span_lint_and_then};
|
use crate::utils::{is_automatically_derived, snippet_opt, span_lint_and_then};
|
||||||
use if_chain::if_chain;
|
use if_chain::if_chain;
|
||||||
use rustc_errors::Applicability;
|
use rustc_errors::Applicability;
|
||||||
use rustc_hir::{BindingAnnotation, BorrowKind, Expr, ExprKind, HirId, Item, Mutability, Pat, PatKind};
|
use rustc_hir::{BindingAnnotation, BorrowKind, Expr, ExprKind, Item, Mutability, Pat, PatKind};
|
||||||
use rustc_lint::{LateContext, LateLintPass};
|
use rustc_lint::{LateContext, LateLintPass};
|
||||||
use rustc_middle::ty;
|
use rustc_middle::ty;
|
||||||
use rustc_middle::ty::adjustment::{Adjust, Adjustment};
|
use rustc_middle::ty::adjustment::{Adjust, Adjustment};
|
||||||
use rustc_session::{declare_tool_lint, impl_lint_pass};
|
use rustc_session::{declare_tool_lint, impl_lint_pass};
|
||||||
|
use rustc_span::def_id::LocalDefId;
|
||||||
|
|
||||||
declare_clippy_lint! {
|
declare_clippy_lint! {
|
||||||
/// **What it does:** Checks for address of operations (`&`) that are going to
|
/// **What it does:** Checks for address of operations (`&`) that are going to
|
||||||
|
@ -35,7 +36,7 @@ declare_clippy_lint! {
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct NeedlessBorrow {
|
pub struct NeedlessBorrow {
|
||||||
derived_item: Option<HirId>,
|
derived_item: Option<LocalDefId>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl_lint_pass!(NeedlessBorrow => [NEEDLESS_BORROW]);
|
impl_lint_pass!(NeedlessBorrow => [NEEDLESS_BORROW]);
|
||||||
|
@ -117,13 +118,13 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessBorrow {
|
||||||
fn check_item(&mut self, _: &LateContext<'tcx>, item: &'tcx Item<'_>) {
|
fn check_item(&mut self, _: &LateContext<'tcx>, item: &'tcx Item<'_>) {
|
||||||
if is_automatically_derived(item.attrs) {
|
if is_automatically_derived(item.attrs) {
|
||||||
debug_assert!(self.derived_item.is_none());
|
debug_assert!(self.derived_item.is_none());
|
||||||
self.derived_item = Some(item.hir_id);
|
self.derived_item = Some(item.def_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_item_post(&mut self, _: &LateContext<'tcx>, item: &'tcx Item<'_>) {
|
fn check_item_post(&mut self, _: &LateContext<'tcx>, item: &'tcx Item<'_>) {
|
||||||
if let Some(id) = self.derived_item {
|
if let Some(id) = self.derived_item {
|
||||||
if item.hir_id == id {
|
if item.def_id == id {
|
||||||
self.derived_item = None;
|
self.derived_item = None;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -124,7 +124,7 @@ declare_lint_pass!(Ptr => [PTR_ARG, CMP_NULL, MUT_FROM_REF]);
|
||||||
impl<'tcx> LateLintPass<'tcx> for Ptr {
|
impl<'tcx> LateLintPass<'tcx> for Ptr {
|
||||||
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
|
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
|
||||||
if let ItemKind::Fn(ref sig, _, body_id) = item.kind {
|
if let ItemKind::Fn(ref sig, _, body_id) = item.kind {
|
||||||
check_fn(cx, &sig.decl, item.hir_id, Some(body_id));
|
check_fn(cx, &sig.decl, item.hir_id(), Some(body_id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,11 +42,10 @@ impl_lint_pass!(RedundantPubCrate => [REDUNDANT_PUB_CRATE]);
|
||||||
impl<'tcx> LateLintPass<'tcx> for RedundantPubCrate {
|
impl<'tcx> LateLintPass<'tcx> for RedundantPubCrate {
|
||||||
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'tcx>) {
|
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'tcx>) {
|
||||||
if let VisibilityKind::Crate { .. } = item.vis.node {
|
if let VisibilityKind::Crate { .. } = item.vis.node {
|
||||||
if !cx.access_levels.is_exported(item.hir_id) {
|
if !cx.access_levels.is_exported(item.hir_id()) {
|
||||||
if let Some(false) = self.is_exported.last() {
|
if let Some(false) = self.is_exported.last() {
|
||||||
let span = item.span.with_hi(item.ident.span.hi());
|
let span = item.span.with_hi(item.ident.span.hi());
|
||||||
let def_id = cx.tcx.hir().local_def_id(item.hir_id);
|
let descr = cx.tcx.def_kind(item.def_id).descr(item.def_id.to_def_id());
|
||||||
let descr = cx.tcx.def_kind(def_id).descr(def_id.to_def_id());
|
|
||||||
span_lint_and_then(
|
span_lint_and_then(
|
||||||
cx,
|
cx,
|
||||||
REDUNDANT_PUB_CRATE,
|
REDUNDANT_PUB_CRATE,
|
||||||
|
@ -66,7 +65,7 @@ impl<'tcx> LateLintPass<'tcx> for RedundantPubCrate {
|
||||||
}
|
}
|
||||||
|
|
||||||
if let ItemKind::Mod { .. } = item.kind {
|
if let ItemKind::Mod { .. } = item.kind {
|
||||||
self.is_exported.push(cx.access_levels.is_exported(item.hir_id));
|
self.is_exported.push(cx.access_levels.is_exported(item.hir_id()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1106,7 +1106,9 @@ fn is_empty_block(expr: &Expr<'_>) -> bool {
|
||||||
expr.kind,
|
expr.kind,
|
||||||
ExprKind::Block(
|
ExprKind::Block(
|
||||||
Block {
|
Block {
|
||||||
stmts: &[], expr: None, ..
|
stmts: &[],
|
||||||
|
expr: None,
|
||||||
|
..
|
||||||
},
|
},
|
||||||
_,
|
_,
|
||||||
)
|
)
|
||||||
|
@ -2565,7 +2567,7 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitHasher {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !cx.access_levels.is_exported(item.hir_id) {
|
if !cx.access_levels.is_exported(item.hir_id()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -196,8 +196,7 @@ impl<'tcx> LateLintPass<'tcx> for UseSelf {
|
||||||
item_path,
|
item_path,
|
||||||
cx,
|
cx,
|
||||||
};
|
};
|
||||||
let impl_def_id = cx.tcx.hir().local_def_id(item.hir_id);
|
let impl_trait_ref = cx.tcx.impl_trait_ref(item.def_id);
|
||||||
let impl_trait_ref = cx.tcx.impl_trait_ref(impl_def_id);
|
|
||||||
|
|
||||||
if let Some(impl_trait_ref) = impl_trait_ref {
|
if let Some(impl_trait_ref) = impl_trait_ref {
|
||||||
for impl_item_ref in impl_.items {
|
for impl_item_ref in impl_.items {
|
||||||
|
|
|
@ -370,7 +370,7 @@ fn print_expr(cx: &LateContext<'_>, expr: &hir::Expr<'_>, indent: usize) {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn print_item(cx: &LateContext<'_>, item: &hir::Item<'_>) {
|
fn print_item(cx: &LateContext<'_>, item: &hir::Item<'_>) {
|
||||||
let did = cx.tcx.hir().local_def_id(item.hir_id);
|
let did = item.def_id;
|
||||||
println!("item `{}`", item.ident.name);
|
println!("item `{}`", item.ident.name);
|
||||||
match item.vis.node {
|
match item.vis.node {
|
||||||
hir::VisibilityKind::Public => println!("public"),
|
hir::VisibilityKind::Public => println!("public"),
|
||||||
|
@ -383,8 +383,7 @@ fn print_item(cx: &LateContext<'_>, item: &hir::Item<'_>) {
|
||||||
}
|
}
|
||||||
match item.kind {
|
match item.kind {
|
||||||
hir::ItemKind::ExternCrate(ref _renamed_from) => {
|
hir::ItemKind::ExternCrate(ref _renamed_from) => {
|
||||||
let def_id = cx.tcx.hir().local_def_id(item.hir_id);
|
if let Some(crate_id) = cx.tcx.extern_mod_stmt_cnum(did) {
|
||||||
if let Some(crate_id) = cx.tcx.extern_mod_stmt_cnum(def_id) {
|
|
||||||
let source = cx.tcx.used_crate_source(crate_id);
|
let source = cx.tcx.used_crate_source(crate_id);
|
||||||
if let Some(ref src) = source.dylib {
|
if let Some(ref src) = source.dylib {
|
||||||
println!("extern crate dylib source: {:?}", src.0);
|
println!("extern crate dylib source: {:?}", src.0);
|
||||||
|
|
|
@ -113,7 +113,7 @@ impl LateLintPass<'_> for WildcardImports {
|
||||||
if_chain! {
|
if_chain! {
|
||||||
if let ItemKind::Use(use_path, UseKind::Glob) = &item.kind;
|
if let ItemKind::Use(use_path, UseKind::Glob) = &item.kind;
|
||||||
if self.warn_on_all || !self.check_exceptions(item, use_path.segments);
|
if self.warn_on_all || !self.check_exceptions(item, use_path.segments);
|
||||||
let used_imports = cx.tcx.names_imported_by_glob_use(item.hir_id.owner);
|
let used_imports = cx.tcx.names_imported_by_glob_use(item.def_id);
|
||||||
if !used_imports.is_empty(); // Already handled by `unused_imports`
|
if !used_imports.is_empty(); // Already handled by `unused_imports`
|
||||||
then {
|
then {
|
||||||
let mut applicability = Applicability::MachineApplicable;
|
let mut applicability = Applicability::MachineApplicable;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue