bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

convert all_macro_rules from hashmap to hashset

Browse source
This commit is contained in:
klensy 2025-02-21 15:29:17 +03:00
parent 918b5c391f
commit 8d2de634ec
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_middle/src/ty/mod.rs
View file

@ -179,7 +179,7 @@ pub struct ResolverGlobalCtxt {
pub confused_type_with_std_module: FxIndexMap<Span, Span>, pub confused_type_with_std_module: FxIndexMap<Span, Span>,
pub doc_link_resolutions: FxIndexMap<LocalDefId, DocLinkResMap>, pub doc_link_resolutions: FxIndexMap<LocalDefId, DocLinkResMap>,
pub doc_link_traits_in_scope: FxIndexMap<LocalDefId, Vec<DefId>>, pub doc_link_traits_in_scope: FxIndexMap<LocalDefId, Vec<DefId>>,
pub all_macro_rules: FxHashMap<Symbol, Res<ast::NodeId>>, pub all_macro_rules: FxHashSet<Symbol>,
pub stripped_cfg_items: Steal<Vec<StrippedCfgItem>>, pub stripped_cfg_items: Steal<Vec<StrippedCfgItem>>,
} }

2
compiler/rustc_resolve/src/build_reduced_graph.rs
View file

@ -1241,7 +1241,7 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
}; };
let binding = (res, vis, span, expansion).to_name_binding(self.r.arenas); let binding = (res, vis, span, expansion).to_name_binding(self.r.arenas);
self.r.set_binding_parent_module(binding, parent_scope.module); self.r.set_binding_parent_module(binding, parent_scope.module);
self.r.all_macro_rules.insert(ident.name, res); self.r.all_macro_rules.insert(ident.name);
if is_macro_export { if is_macro_export {
let import = self.r.arenas.alloc_import(ImportData { let import = self.r.arenas.alloc_import(ImportData {
kind: ImportKind::MacroExport, kind: ImportKind::MacroExport,

2
compiler/rustc_resolve/src/lib.rs
View file

@ -1220,7 +1220,7 @@ pub struct Resolver<'ra, 'tcx> {
effective_visibilities: EffectiveVisibilities, effective_visibilities: EffectiveVisibilities,
doc_link_resolutions: FxIndexMap<LocalDefId, DocLinkResMap>, doc_link_resolutions: FxIndexMap<LocalDefId, DocLinkResMap>,
doc_link_traits_in_scope: FxIndexMap<LocalDefId, Vec<DefId>>, doc_link_traits_in_scope: FxIndexMap<LocalDefId, Vec<DefId>>,
all_macro_rules: FxHashMap<Symbol, Res>, all_macro_rules: FxHashSet<Symbol>,
/// Invocation ids of all glob delegations. /// Invocation ids of all glob delegations.
glob_delegation_invoc_ids: FxHashSet<LocalExpnId>, glob_delegation_invoc_ids: FxHashSet<LocalExpnId>,

2
src/librustdoc/passes/collect_intra_doc_links.rs
View file

@ -1983,7 +1983,7 @@ fn resolution_failure(
.tcx .tcx
.resolutions(()) .resolutions(())
.all_macro_rules .all_macro_rules
.contains_key(&Symbol::intern(path_str)) .contains(&Symbol::intern(path_str))
{ {
diag.note(format!( diag.note(format!(
"`macro_rules` named `{path_str}` exists in this crate, \ "`macro_rules` named `{path_str}` exists in this crate, \