mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #128521 - aDotInTheVoid:opaque-fallout, r=camelid

Browse Source 
rustdoc: Remove dead opaque_tys rendering logic

#127276 removed OpaqueTy from clean, and the code populating AllTypes::opaque_tys, but not this field itself.
This commit is contained in:
Matthias Krüger 2024-08-02 06:43:44 +02:00 committed by GitHub
commit 1140fd1b8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustdoc/html/render/mod.rs
View File

@ -332,7 +332,6 @@ struct AllTypes {
macros: FxHashSet<ItemEntry>, macros: FxHashSet<ItemEntry>,
functions: FxHashSet<ItemEntry>, functions: FxHashSet<ItemEntry>,
type_aliases: FxHashSet<ItemEntry>, type_aliases: FxHashSet<ItemEntry>,
opaque_tys: FxHashSet<ItemEntry>,
statics: FxHashSet<ItemEntry>, statics: FxHashSet<ItemEntry>,
constants: FxHashSet<ItemEntry>, constants: FxHashSet<ItemEntry>,
attribute_macros: FxHashSet<ItemEntry>, attribute_macros: FxHashSet<ItemEntry>,
@ -352,7 +351,6 @@ fn new() -> AllTypes {
macros: new_set(100), macros: new_set(100),
functions: new_set(100), functions: new_set(100),
type_aliases: new_set(100), type_aliases: new_set(100),
opaque_tys: new_set(100),
statics: new_set(100), statics: new_set(100),
constants: new_set(100), constants: new_set(100),
attribute_macros: new_set(100), attribute_macros: new_set(100),
@ -415,9 +413,6 @@ fn item_sections(&self) -> FxHashSet<ItemSection> {
if !self.type_aliases.is_empty() { if !self.type_aliases.is_empty() {
sections.insert(ItemSection::TypeAliases); sections.insert(ItemSection::TypeAliases);
} }
if !self.opaque_tys.is_empty() {
sections.insert(ItemSection::OpaqueTypes);
}
if !self.statics.is_empty() { if !self.statics.is_empty() {
sections.insert(ItemSection::Statics); sections.insert(ItemSection::Statics);
} }
@ -471,7 +466,6 @@ fn print_entries(f: &mut Buffer, e: &FxHashSet<ItemEntry>, kind: ItemSection) {
print_entries(f, &self.functions, ItemSection::Functions); print_entries(f, &self.functions, ItemSection::Functions);
print_entries(f, &self.type_aliases, ItemSection::TypeAliases); print_entries(f, &self.type_aliases, ItemSection::TypeAliases);
print_entries(f, &self.trait_aliases, ItemSection::TraitAliases); print_entries(f, &self.trait_aliases, ItemSection::TraitAliases);
print_entries(f, &self.opaque_tys, ItemSection::OpaqueTypes);
print_entries(f, &self.statics, ItemSection::Statics); print_entries(f, &self.statics, ItemSection::Statics);
print_entries(f, &self.constants, ItemSection::Constants); print_entries(f, &self.constants, ItemSection::Constants);
} }
@ -2174,7 +2168,6 @@ pub(crate) enum ItemSection {
AssociatedConstants, AssociatedConstants,
ForeignTypes, ForeignTypes,
Keywords, Keywords,
OpaqueTypes,
AttributeMacros, AttributeMacros,
DeriveMacros, DeriveMacros,
TraitAliases, TraitAliases,
@ -2207,7 +2200,6 @@ impl ItemSection {
AssociatedConstants, AssociatedConstants,
ForeignTypes, ForeignTypes,
Keywords, Keywords,
OpaqueTypes,
AttributeMacros, AttributeMacros,
DeriveMacros, DeriveMacros,
TraitAliases, TraitAliases,
@ -2237,7 +2229,6 @@ fn id(self) -> &'static str {
Self::AssociatedConstants => "associated-consts", Self::AssociatedConstants => "associated-consts",
Self::ForeignTypes => "foreign-types", Self::ForeignTypes => "foreign-types",
Self::Keywords => "keywords", Self::Keywords => "keywords",
Self::OpaqueTypes => "opaque-types",
Self::AttributeMacros => "attributes", Self::AttributeMacros => "attributes",
Self::DeriveMacros => "derives", Self::DeriveMacros => "derives",
Self::TraitAliases => "trait-aliases", Self::TraitAliases => "trait-aliases",
@ -2267,7 +2258,6 @@ fn name(self) -> &'static str {
Self::AssociatedConstants => "Associated Constants", Self::AssociatedConstants => "Associated Constants",
Self::ForeignTypes => "Foreign Types", Self::ForeignTypes => "Foreign Types",
Self::Keywords => "Keywords", Self::Keywords => "Keywords",
Self::OpaqueTypes => "Opaque Types",
Self::AttributeMacros => "Attribute Macros", Self::AttributeMacros => "Attribute Macros",
Self::DeriveMacros => "Derive Macros", Self::DeriveMacros => "Derive Macros",
Self::TraitAliases => "Trait Aliases", Self::TraitAliases => "Trait Aliases",

1
src/librustdoc/html/static/js/main.js
View File

@ -568,7 +568,6 @@ function preLoadCss(cssUrl) {
//block("associatedconstant", "associated-consts", "Associated Constants"); //block("associatedconstant", "associated-consts", "Associated Constants");
block("foreigntype", "foreign-types", "Foreign Types"); block("foreigntype", "foreign-types", "Foreign Types");
block("keyword", "keywords", "Keywords"); block("keyword", "keywords", "Keywords");
block("opaque", "opaque-types", "Opaque Types");
block("attr", "attributes", "Attribute Macros"); block("attr", "attributes", "Attribute Macros");
block("derive", "derives", "Derive Macros"); block("derive", "derives", "Derive Macros");
block("traitalias", "trait-aliases", "Trait Aliases"); block("traitalias", "trait-aliases", "Trait Aliases");