Skip to content

Commit 05ff9cd

Browse files
committed
Address review comments.
1 parent b6d282d commit 05ff9cd

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/tools/clippy/clippy_lints/src/attrs/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mod utils;
1616
use clippy_config::Conf;
1717
use clippy_utils::msrvs::{self, Msrv, MsrvStack};
1818
use rustc_ast::{self as ast, Attribute, MetaItemInner, MetaItemKind};
19-
use rustc_hir::{ImplItem, Item, TraitItem};
19+
use rustc_hir::{ImplItem, Item, ItemKind, TraitItem};
2020
use rustc_lint::{EarlyContext, EarlyLintPass, LateContext, LateLintPass};
2121
use rustc_session::impl_lint_pass;
2222
use rustc_span::sym;
@@ -466,8 +466,7 @@ impl Attributes {
466466
impl<'tcx> LateLintPass<'tcx> for Attributes {
467467
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
468468
let attrs = cx.tcx.hir().attrs(item.hir_id());
469-
if is_relevant_item(cx, item) {
470-
let (ident, _, _, _) = item.expect_fn();
469+
if let ItemKind::Fn { ident, .. } = item.kind && is_relevant_item(cx, item) {
471470
inline_always::check(cx, item.span, ident.name, attrs);
472471
}
473472
repr_attributes::check(cx, item.span, attrs, self.msrv);

src/tools/clippy/clippy_lints/src/redundant_pub_crate.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use rustc_middle::ty;
88
use rustc_session::impl_lint_pass;
99
use rustc_span::def_id::CRATE_DEF_ID;
1010
use rustc_span::hygiene::MacroKind;
11+
use rustc_span::Ident;
1112

1213
declare_clippy_lint! {
1314
/// ### What it does
@@ -52,7 +53,7 @@ impl<'tcx> LateLintPass<'tcx> for RedundantPubCrate {
5253
&& is_not_macro_export(item)
5354
&& !item.span.in_external_macro(cx.sess().source_map())
5455
{
55-
let span = item.span.with_hi(item.kind.ident().unwrap().span.hi());
56+
let span = item.span.with_hi(item.kind.ident().unwrap_or(Ident::empty()).span.hi());
5657
let descr = cx.tcx.def_kind(item.owner_id).descr(item.owner_id.to_def_id());
5758
span_lint_and_then(
5859
cx,

src/tools/clippy/clippy_utils/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ fn local_item_children_by_name(tcx: TyCtxt<'_>, local_id: LocalDefId, name: Symb
644644
let root_mod;
645645
let item_kind = match tcx.hir_node_by_def_id(local_id) {
646646
Node::Crate(r#mod) => {
647-
root_mod = ItemKind::Mod(Ident::empty(), r#mod);
647+
root_mod = ItemKind::Mod(Ident::dummy(), r#mod);
648648
&root_mod
649649
},
650650
Node::Item(item) => &item.kind,

0 commit comments

Comments
 (0)