Improve some AllTypes fields name

This commit is contained in:
Guillaume Gomez 2022-09-22 13:08:44 +02:00
parent 3e50038a2d
commit d3f97a331c

View File

@ -239,8 +239,8 @@ struct AllTypes {
opaque_tys: FxHashSet<ItemEntry>, opaque_tys: FxHashSet<ItemEntry>,
statics: FxHashSet<ItemEntry>, statics: FxHashSet<ItemEntry>,
constants: FxHashSet<ItemEntry>, constants: FxHashSet<ItemEntry>,
attributes: FxHashSet<ItemEntry>, attribute_macros: FxHashSet<ItemEntry>,
derives: FxHashSet<ItemEntry>, derive_macros: FxHashSet<ItemEntry>,
trait_aliases: FxHashSet<ItemEntry>, trait_aliases: FxHashSet<ItemEntry>,
} }
@ -259,8 +259,8 @@ fn new() -> AllTypes {
opaque_tys: new_set(100), opaque_tys: new_set(100),
statics: new_set(100), statics: new_set(100),
constants: new_set(100), constants: new_set(100),
attributes: new_set(100), attribute_macros: new_set(100),
derives: new_set(100), derive_macros: new_set(100),
trait_aliases: new_set(100), trait_aliases: new_set(100),
} }
} }
@ -283,8 +283,10 @@ fn append(&mut self, item_name: String, item_type: &ItemType) {
ItemType::OpaqueTy => self.opaque_tys.insert(ItemEntry::new(new_url, name)), ItemType::OpaqueTy => self.opaque_tys.insert(ItemEntry::new(new_url, name)),
ItemType::Static => self.statics.insert(ItemEntry::new(new_url, name)), ItemType::Static => self.statics.insert(ItemEntry::new(new_url, name)),
ItemType::Constant => self.constants.insert(ItemEntry::new(new_url, name)), ItemType::Constant => self.constants.insert(ItemEntry::new(new_url, name)),
ItemType::ProcAttribute => self.attributes.insert(ItemEntry::new(new_url, name)), ItemType::ProcAttribute => {
ItemType::ProcDerive => self.derives.insert(ItemEntry::new(new_url, name)), self.attribute_macros.insert(ItemEntry::new(new_url, name))
}
ItemType::ProcDerive => self.derive_macros.insert(ItemEntry::new(new_url, name)),
ItemType::TraitAlias => self.trait_aliases.insert(ItemEntry::new(new_url, name)), ItemType::TraitAlias => self.trait_aliases.insert(ItemEntry::new(new_url, name)),
_ => true, _ => true,
}; };
@ -327,10 +329,10 @@ fn item_sections(&self) -> FxHashSet<ItemSection> {
if !self.constants.is_empty() { if !self.constants.is_empty() {
sections.insert(ItemSection::Constants); sections.insert(ItemSection::Constants);
} }
if !self.attributes.is_empty() { if !self.attribute_macros.is_empty() {
sections.insert(ItemSection::AttributeMacros); sections.insert(ItemSection::AttributeMacros);
} }
if !self.derives.is_empty() { if !self.derive_macros.is_empty() {
sections.insert(ItemSection::DeriveMacros); sections.insert(ItemSection::DeriveMacros);
} }
if !self.trait_aliases.is_empty() { if !self.trait_aliases.is_empty() {
@ -373,8 +375,8 @@ fn print_entries(f: &mut Buffer, e: &FxHashSet<ItemEntry>, kind: ItemSection) {
print_entries(f, &self.primitives, ItemSection::PrimitiveTypes); print_entries(f, &self.primitives, ItemSection::PrimitiveTypes);
print_entries(f, &self.traits, ItemSection::Traits); print_entries(f, &self.traits, ItemSection::Traits);
print_entries(f, &self.macros, ItemSection::Macros); print_entries(f, &self.macros, ItemSection::Macros);
print_entries(f, &self.attributes, ItemSection::AttributeMacros); print_entries(f, &self.attribute_macros, ItemSection::AttributeMacros);
print_entries(f, &self.derives, ItemSection::DeriveMacros); print_entries(f, &self.derive_macros, ItemSection::DeriveMacros);
print_entries(f, &self.functions, ItemSection::Functions); print_entries(f, &self.functions, ItemSection::Functions);
print_entries(f, &self.typedefs, ItemSection::TypeDefinitions); print_entries(f, &self.typedefs, ItemSection::TypeDefinitions);
print_entries(f, &self.trait_aliases, ItemSection::TraitAliases); print_entries(f, &self.trait_aliases, ItemSection::TraitAliases);