Skip to content

Commit ec10833

Browse files
nnethercotennethercote
committed
Address review comments.
1 parent df24796 commit ec10833

File tree

12 files changed

+101
-96
lines changed

12 files changed

+101
-96
lines changed

‎compiler/rustc_ast_passes/src/ast_validation.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -817,10 +817,10 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
817817
self.has_proc_macro_decls = true;
818818
}
819819

820-
if attr::contains_name(&item.attrs, sym::no_mangle) {
821-
if let Some(ident) = item.kind.ident() {
822-
self.check_nomangle_item_asciionly(ident, item.span);
823-
}
820+
if let Some(ident) = item.kind.ident()
821+
&& attr::contains_name(&item.attrs, sym::no_mangle)
822+
{
823+
self.check_nomangle_item_asciionly(ident, item.span);
824824
}
825825

826826
match &item.kind {
@@ -1412,10 +1412,10 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
14121412
}
14131413

14141414
fn visit_assoc_item(&mut self, item: &'a AssocItem, ctxt: AssocCtxt) {
1415-
if attr::contains_name(&item.attrs, sym::no_mangle) {
1416-
if let Some(ident) = item.kind.ident() {
1417-
self.check_nomangle_item_asciionly(ident, item.span);
1418-
}
1415+
if let Some(ident) = item.kind.ident()
1416+
&& attr::contains_name(&item.attrs, sym::no_mangle)
1417+
{
1418+
self.check_nomangle_item_asciionly(ident, item.span);
14191419
}
14201420

14211421
if ctxt == AssocCtxt::Trait || self.outer_trait_or_trait_impl.is_none() {

‎compiler/rustc_builtin_macros/src/proc_macro_harness.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,8 @@ impl<'a> Visitor<'a> for CollectProcMacros<'a> {
213213
return;
214214
};
215215

216-
// First up, make sure we're checking a bare function. If we're not then
217-
// we're just not interested in this item.
218-
//
219-
// If we find one, try to locate a `#[proc_macro_derive]` attribute on it.
216+
// Make sure we're checking a bare function. If we're not then we're
217+
// just not interested any further in this item.
220218
let fn_ident = if let ast::ItemKind::Fn(fn_) = &item.kind {
221219
fn_.ident
222220
} else {
@@ -243,6 +241,7 @@ impl<'a> Visitor<'a> for CollectProcMacros<'a> {
243241
return;
244242
}
245243

244+
// Try to locate a `#[proc_macro_derive]` attribute.
246245
if attr.has_name(sym::proc_macro_derive) {
247246
self.collect_custom_derive(item, fn_ident, attr);
248247
} else if attr.has_name(sym::proc_macro_attribute) {

‎compiler/rustc_expand/src/expand.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,9 +1223,7 @@ impl InvocationCollectorNode for P<ast::Item> {
12231223

12241224
// Work around borrow checker not seeing through `P`'s deref.
12251225
let (span, mut attrs) = (node.span, mem::take(&mut node.attrs));
1226-
let ItemKind::Mod(_, ident, mod_kind) = &mut node.kind else { unreachable!() };
1227-
let ident = *ident;
1228-
1226+
let ItemKind::Mod(_, ident, ref mut mod_kind) = node.kind else { unreachable!() };
12291227
let ecx = &mut collector.cx;
12301228
let (file_path, dir_path, dir_ownership) = match mod_kind {
12311229
ModKind::Loaded(_, inline, _, _) => {

‎compiler/rustc_parse/src/parser/item.rs‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,7 @@ impl<'a> Parser<'a> {
243243
// STATIC ITEM
244244
self.bump(); // `static`
245245
let mutability = self.parse_mutability();
246-
let item = self.parse_static_item(safety, mutability)?;
247-
ItemKind::Static(Box::new(item))
246+
self.parse_static_item(safety, mutability)?
248247
} else if let Const::Yes(const_span) = self.parse_constness(Case::Sensitive) {
249248
// CONST ITEM
250249
if self.token.is_keyword(kw::Impl) {
@@ -681,7 +680,7 @@ impl<'a> Parser<'a> {
681680
}
682681
None => (None, ty_first), // impl Type
683682
};
684-
let item_kind = ItemKind::Impl(Box::new(Impl {
683+
Ok(ItemKind::Impl(Box::new(Impl {
685684
safety,
686685
polarity,
687686
defaultness,
@@ -690,9 +689,7 @@ impl<'a> Parser<'a> {
690689
of_trait,
691690
self_ty,
692691
items: impl_items,
693-
}));
694-
695-
Ok(item_kind)
692+
})))
696693
}
697694

698695
fn parse_item_delegation(&mut self) -> PResult<'a, ItemKind> {
@@ -1222,13 +1219,12 @@ impl<'a> Parser<'a> {
12221219
safety = Safety::Unsafe(self.token.span);
12231220
let _ = self.eat_keyword(exp!(Unsafe));
12241221
}
1225-
let module = ast::ForeignMod {
1222+
Ok(ItemKind::ForeignMod(ast::ForeignMod {
12261223
extern_span,
12271224
safety,
12281225
abi,
12291226
items: self.parse_item_list(attrs, |p| p.parse_foreign_item(ForceCollect::No))?,
1230-
};
1231-
Ok(ItemKind::ForeignMod(module))
1227+
}))
12321228
}
12331229

12341230
/// Parses a foreign item (one in an `extern { ... }` block).
@@ -1370,7 +1366,8 @@ impl<'a> Parser<'a> {
13701366
Ok(item_kind)
13711367
}
13721368

1373-
/// Parse a static item with the prefix `"static" "mut"?` already parsed and stored in `mutability`.
1369+
/// Parse a static item with the prefix `"static" "mut"?` already parsed and stored in
1370+
/// `mutability`.
13741371
///
13751372
/// ```ebnf
13761373
/// Static = "static" "mut"? $ident ":" $ty (= $expr)? ";" ;
@@ -1379,7 +1376,7 @@ impl<'a> Parser<'a> {
13791376
&mut self,
13801377
safety: Safety,
13811378
mutability: Mutability,
1382-
) -> PResult<'a, StaticItem> {
1379+
) -> PResult<'a, ItemKind> {
13831380
let ident = self.parse_ident()?;
13841381

13851382
if self.token == TokenKind::Lt && self.may_recover() {
@@ -1391,15 +1388,17 @@ impl<'a> Parser<'a> {
13911388
// FIXME: This could maybe benefit from `.may_recover()`?
13921389
let ty = match (self.eat(exp!(Colon)), self.check(exp!(Eq)) | self.check(exp!(Semi))) {
13931390
(true, false) => self.parse_ty()?,
1394-
// If there wasn't a `:` or the colon was followed by a `=` or `;`, recover a missing type.
1391+
// If there wasn't a `:` or the colon was followed by a `=` or `;`, recover a missing
1392+
// type.
13951393
(colon, _) => self.recover_missing_global_item_type(colon, Some(mutability)),
13961394
};
13971395

13981396
let expr = if self.eat(exp!(Eq)) { Some(self.parse_expr()?) } else { None };
13991397

14001398
self.expect_semi()?;
14011399

1402-
Ok(StaticItem { ident, ty, safety, mutability, expr, define_opaque: None })
1400+
let item = StaticItem { ident, ty, safety, mutability, expr, define_opaque: None };
1401+
Ok(ItemKind::Static(Box::new(item)))
14031402
}
14041403

14051404
/// Parse a constant item with the prefix `"const"` already parsed.
@@ -1537,7 +1536,7 @@ impl<'a> Parser<'a> {
15371536
}
15381537

15391538
let prev_span = self.prev_token.span;
1540-
let id = self.parse_ident()?;
1539+
let ident = self.parse_ident()?;
15411540
let mut generics = self.parse_generics()?;
15421541
generics.where_clause = self.parse_where_clause()?;
15431542

@@ -1548,10 +1547,10 @@ impl<'a> Parser<'a> {
15481547
(thin_vec![], Trailing::No)
15491548
} else {
15501549
self.parse_delim_comma_seq(exp!(OpenBrace), exp!(CloseBrace), |p| {
1551-
p.parse_enum_variant(id.span)
1550+
p.parse_enum_variant(ident.span)
15521551
})
15531552
.map_err(|mut err| {
1554-
err.span_label(id.span, "while parsing this enum");
1553+
err.span_label(ident.span, "while parsing this enum");
15551554
if self.token == token::Colon {
15561555
let snapshot = self.create_snapshot_for_diagnostic();
15571556
self.bump();
@@ -1577,7 +1576,7 @@ impl<'a> Parser<'a> {
15771576
};
15781577

15791578
let enum_definition = EnumDef { variants: variants.into_iter().flatten().collect() };
1580-
Ok(ItemKind::Enum(id, enum_definition, generics))
1579+
Ok(ItemKind::Enum(ident, enum_definition, generics))
15811580
}
15821581

15831582
fn parse_enum_variant(&mut self, span: Span) -> PResult<'a, Option<Variant>> {

‎compiler/rustc_resolve/src/build_reduced_graph.rs‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use std::sync::Arc;
1010

1111
use rustc_ast::visit::{self, AssocCtxt, Visitor, WalkItemKind};
1212
use rustc_ast::{
13-
self as ast, AssocItem, AssocItemKind, Block, ConstItem, Delegation, ForeignItem,
14-
ForeignItemKind, Impl, Item, ItemKind, MetaItemKind, NodeId, StaticItem, StmtKind,
13+
self as ast, AssocItem, AssocItemKind, Block, ConstItem, Delegation, Fn, ForeignItem,
14+
ForeignItemKind, Impl, Item, ItemKind, MetaItemKind, NodeId, StaticItem, StmtKind, TyAlias,
1515
};
1616
use rustc_attr_parsing as attr;
1717
use rustc_expand::base::ResolverExpand;
@@ -764,8 +764,8 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
764764
ItemKind::ExternCrate(orig_name, ident) => {
765765
self.build_reduced_graph_for_extern_crate(
766766
orig_name,
767-
ident,
768767
item,
768+
ident,
769769
local_def_id,
770770
vis,
771771
parent,
@@ -797,7 +797,7 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
797797
| ItemKind::Static(box StaticItem { ident, .. }) => {
798798
self.r.define(parent, ident, ValueNS, (res, vis, sp, expansion));
799799
}
800-
ItemKind::Fn(box ast::Fn { ident, .. }) => {
800+
ItemKind::Fn(box Fn { ident, .. }) => {
801801
self.r.define(parent, ident, ValueNS, (res, vis, sp, expansion));
802802

803803
// Functions introducing procedural macros reserve a slot
@@ -806,7 +806,7 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
806806
}
807807

808808
// These items live in the type namespace.
809-
ItemKind::TyAlias(box ast::TyAlias { ident, .. }) | ItemKind::TraitAlias(ident, ..) => {
809+
ItemKind::TyAlias(box TyAlias { ident, .. }) | ItemKind::TraitAlias(ident, ..) => {
810810
self.r.define(parent, ident, TypeNS, (res, vis, sp, expansion));
811811
}
812812

@@ -900,8 +900,8 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
900900
fn build_reduced_graph_for_extern_crate(
901901
&mut self,
902902
orig_name: Option<Symbol>,
903-
ident: Ident,
904903
item: &Item,
904+
ident: Ident,
905905
local_def_id: LocalDefId,
906906
vis: ty::Visibility,
907907
parent: Module<'ra>,
@@ -1362,14 +1362,16 @@ impl<'a, 'ra, 'tcx> Visitor<'a> for BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
13621362
}
13631363

13641364
fn visit_foreign_item(&mut self, foreign_item: &'a ForeignItem) {
1365-
if let ForeignItemKind::MacCall(_) = foreign_item.kind {
1366-
self.visit_invoc_in_module(foreign_item.id);
1367-
return;
1368-
}
1365+
let ident = match foreign_item.kind {
1366+
ForeignItemKind::Static(box StaticItem { ident, .. })
1367+
| ForeignItemKind::Fn(box Fn { ident, .. })
1368+
| ForeignItemKind::TyAlias(box TyAlias { ident, .. }) => ident,
1369+
ForeignItemKind::MacCall(_) => {
1370+
self.visit_invoc_in_module(foreign_item.id);
1371+
return;
1372+
}
1373+
};
13691374

1370-
// `unwrap` is safe because `MacCall` has been excluded, and other foreign item kinds have
1371-
// an ident.
1372-
let ident = foreign_item.kind.ident().unwrap();
13731375
self.build_reduced_graph_for_foreign_item(foreign_item, ident);
13741376
visit::walk_item(self, foreign_item);
13751377
}
@@ -1384,26 +1386,35 @@ impl<'a, 'ra, 'tcx> Visitor<'a> for BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
13841386
}
13851387

13861388
fn visit_assoc_item(&mut self, item: &'a AssocItem, ctxt: AssocCtxt) {
1387-
if let AssocItemKind::MacCall(_) = item.kind {
1388-
match ctxt {
1389-
AssocCtxt::Trait => {
1390-
self.visit_invoc_in_module(item.id);
1391-
}
1392-
AssocCtxt::Impl { .. } => {
1393-
let invoc_id = item.id.placeholder_to_expn_id();
1394-
if !self.r.glob_delegation_invoc_ids.contains(&invoc_id) {
1395-
self.r
1396-
.impl_unexpanded_invocations
1397-
.entry(self.r.invocation_parent(invoc_id))
1398-
.or_default()
1399-
.insert(invoc_id);
1389+
let (ident, ns) = match item.kind {
1390+
AssocItemKind::Const(box ConstItem { ident, .. })
1391+
| AssocItemKind::Fn(box Fn { ident, .. })
1392+
| AssocItemKind::Delegation(box Delegation { ident, .. }) => (ident, ValueNS),
1393+
1394+
AssocItemKind::Type(box TyAlias { ident, .. }) => (ident, TypeNS),
1395+
1396+
AssocItemKind::MacCall(_) => {
1397+
match ctxt {
1398+
AssocCtxt::Trait => {
1399+
self.visit_invoc_in_module(item.id);
1400+
}
1401+
AssocCtxt::Impl { .. } => {
1402+
let invoc_id = item.id.placeholder_to_expn_id();
1403+
if !self.r.glob_delegation_invoc_ids.contains(&invoc_id) {
1404+
self.r
1405+
.impl_unexpanded_invocations
1406+
.entry(self.r.invocation_parent(invoc_id))
1407+
.or_default()
1408+
.insert(invoc_id);
1409+
}
1410+
self.visit_invoc(item.id);
14001411
}
1401-
self.visit_invoc(item.id);
14021412
}
1413+
return;
14031414
}
1404-
return;
1405-
}
14061415

1416+
AssocItemKind::DelegationMac(..) => bug!(),
1417+
};
14071418
let vis = self.resolve_visibility(&item.vis);
14081419
let feed = self.r.feed(item.id);
14091420
let local_def_id = feed.key();
@@ -1418,16 +1429,6 @@ impl<'a, 'ra, 'tcx> Visitor<'a> for BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
14181429
self.r.feed_visibility(feed, vis);
14191430
}
14201431

1421-
let ns = match item.kind {
1422-
AssocItemKind::Const(..) | AssocItemKind::Delegation(..) | AssocItemKind::Fn(..) => {
1423-
ValueNS
1424-
}
1425-
AssocItemKind::Type(..) => TypeNS,
1426-
AssocItemKind::MacCall(_) | AssocItemKind::DelegationMac(..) => bug!(), // handled above
1427-
};
1428-
// `unwrap` is safe because `MacCall`/`DelegationMac` have been excluded, and other foreign
1429-
// item kinds have an ident.
1430-
let ident = item.kind.ident().unwrap();
14311432
if ctxt == AssocCtxt::Trait {
14321433
let parent = self.parent_scope.module;
14331434
let expansion = self.parent_scope.expansion;

‎compiler/rustc_resolve/src/def_collector.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,11 @@ impl<'a, 'ra, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'ra, 'tcx> {
186186
FnKind::Fn(
187187
_ctxt,
188188
_vis,
189-
Fn { sig: FnSig { header, decl, span: _ }, generics, contract, body, .. },
189+
Fn {
190+
sig: FnSig { header, decl, span: _ }, ident, generics, contract, body, ..
191+
},
190192
) if let Some(coroutine_kind) = header.coroutine_kind => {
193+
self.visit_ident(ident);
191194
self.visit_fn_header(header);
192195
self.visit_generics(generics);
193196
if let Some(contract) = contract {

‎compiler/rustc_resolve/src/late.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,9 +1025,10 @@ impl<'ra: 'ast, 'ast, 'tcx> Visitor<'ast> for LateResolutionVisitor<'_, 'ast, 'r
10251025
match fn_kind {
10261026
// Bail if the function is foreign, and thus cannot validly have
10271027
// a body, or if there's no body for some other reason.
1028-
FnKind::Fn(FnCtxt::Foreign, _, Fn { sig, generics, .. })
1029-
| FnKind::Fn(_, _, Fn { sig, generics, body: None, .. }) => {
1028+
FnKind::Fn(FnCtxt::Foreign, _, Fn { sig, ident, generics, .. })
1029+
| FnKind::Fn(_, _, Fn { sig, ident, generics, body: None, .. }) => {
10301030
self.visit_fn_header(&sig.header);
1031+
self.visit_ident(ident);
10311032
self.visit_generics(generics);
10321033
self.with_lifetime_rib(
10331034
LifetimeRibKind::AnonymousCreateParameter {

‎compiler/rustc_resolve/src/late/diagnostics.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,10 @@ impl<'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
227227
&& let FnKind::Fn(_, _, ast::Fn { sig, .. }) = fn_kind
228228
&& let Some(items) = self.diag_metadata.current_impl_items
229229
&& let Some(item) = items.iter().find(|i| {
230-
if let Some(ident) = i.kind.ident()
231-
&& ident.name == item_str.name
232-
{
230+
i.kind.ident().is_some_and(|ident| {
233231
// Don't suggest if the item is in Fn signature arguments (#112590).
234-
!sig.span.contains(item_span)
235-
} else {
236-
false
237-
}
232+
ident.name == item_str.name && !sig.span.contains(item_span)
233+
})
238234
}) {
239235
let sp = item_span.shrink_to_lo();
240236

0 commit comments

Comments
 (0)