Skip to content

Commit 1140fd1

Browse files
authored
Rollup merge of rust-lang#128521 - aDotInTheVoid:opaque-fallout, r=camelid
rustdoc: Remove dead opaque_tys rendering logic rust-lang#127276 removed OpaqueTy from clean, and the code populating AllTypes::opaque_tys, but not this field itself.
2 parents 66d243f + b72685b commit 1140fd1

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

Diff for: src/librustdoc/html/render/mod.rs

-10
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ struct AllTypes {
332332
macros: FxHashSet<ItemEntry>,
333333
functions: FxHashSet<ItemEntry>,
334334
type_aliases: FxHashSet<ItemEntry>,
335-
opaque_tys: FxHashSet<ItemEntry>,
336335
statics: FxHashSet<ItemEntry>,
337336
constants: FxHashSet<ItemEntry>,
338337
attribute_macros: FxHashSet<ItemEntry>,
@@ -352,7 +351,6 @@ impl AllTypes {
352351
macros: new_set(100),
353352
functions: new_set(100),
354353
type_aliases: new_set(100),
355-
opaque_tys: new_set(100),
356354
statics: new_set(100),
357355
constants: new_set(100),
358356
attribute_macros: new_set(100),
@@ -415,9 +413,6 @@ impl AllTypes {
415413
if !self.type_aliases.is_empty() {
416414
sections.insert(ItemSection::TypeAliases);
417415
}
418-
if !self.opaque_tys.is_empty() {
419-
sections.insert(ItemSection::OpaqueTypes);
420-
}
421416
if !self.statics.is_empty() {
422417
sections.insert(ItemSection::Statics);
423418
}
@@ -471,7 +466,6 @@ impl AllTypes {
471466
print_entries(f, &self.functions, ItemSection::Functions);
472467
print_entries(f, &self.type_aliases, ItemSection::TypeAliases);
473468
print_entries(f, &self.trait_aliases, ItemSection::TraitAliases);
474-
print_entries(f, &self.opaque_tys, ItemSection::OpaqueTypes);
475469
print_entries(f, &self.statics, ItemSection::Statics);
476470
print_entries(f, &self.constants, ItemSection::Constants);
477471
}
@@ -2174,7 +2168,6 @@ pub(crate) enum ItemSection {
21742168
AssociatedConstants,
21752169
ForeignTypes,
21762170
Keywords,
2177-
OpaqueTypes,
21782171
AttributeMacros,
21792172
DeriveMacros,
21802173
TraitAliases,
@@ -2207,7 +2200,6 @@ impl ItemSection {
22072200
AssociatedConstants,
22082201
ForeignTypes,
22092202
Keywords,
2210-
OpaqueTypes,
22112203
AttributeMacros,
22122204
DeriveMacros,
22132205
TraitAliases,
@@ -2237,7 +2229,6 @@ impl ItemSection {
22372229
Self::AssociatedConstants => "associated-consts",
22382230
Self::ForeignTypes => "foreign-types",
22392231
Self::Keywords => "keywords",
2240-
Self::OpaqueTypes => "opaque-types",
22412232
Self::AttributeMacros => "attributes",
22422233
Self::DeriveMacros => "derives",
22432234
Self::TraitAliases => "trait-aliases",
@@ -2267,7 +2258,6 @@ impl ItemSection {
22672258
Self::AssociatedConstants => "Associated Constants",
22682259
Self::ForeignTypes => "Foreign Types",
22692260
Self::Keywords => "Keywords",
2270-
Self::OpaqueTypes => "Opaque Types",
22712261
Self::AttributeMacros => "Attribute Macros",
22722262
Self::DeriveMacros => "Derive Macros",
22732263
Self::TraitAliases => "Trait Aliases",

Diff for: src/librustdoc/html/static/js/main.js

-1
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,6 @@ function preLoadCss(cssUrl) {
568568
//block("associatedconstant", "associated-consts", "Associated Constants");
569569
block("foreigntype", "foreign-types", "Foreign Types");
570570
block("keyword", "keywords", "Keywords");
571-
block("opaque", "opaque-types", "Opaque Types");
572571
block("attr", "attributes", "Attribute Macros");
573572
block("derive", "derives", "Derive Macros");
574573
block("traitalias", "trait-aliases", "Trait Aliases");

0 commit comments

Comments
 (0)