Skip to content

Commit b1d82ac

Browse files
Remove spotlight for trait aliases and fix nits
1 parent c20357a commit b1d82ac

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/librustdoc/clean/mod.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1899,13 +1899,11 @@ impl Clean<Item> for doctree::Trait {
18991899
pub struct TraitAlias {
19001900
pub generics: Generics,
19011901
pub bounds: Vec<GenericBound>,
1902-
pub is_spotlight: bool,
19031902
}
19041903

19051904
impl Clean<Item> for doctree::TraitAlias {
19061905
fn clean(&self, cx: &DocContext) -> Item {
19071906
let attrs = self.attrs.clean(cx);
1908-
let is_spotlight = attrs.has_doc_flag("spotlight");
19091907
Item {
19101908
name: Some(self.name.clean(cx)),
19111909
attrs,
@@ -1917,7 +1915,6 @@ impl Clean<Item> for doctree::TraitAlias {
19171915
inner: TraitAliasItem(TraitAlias {
19181916
generics: self.generics.clean(cx),
19191917
bounds: self.bounds.clean(cx),
1920-
is_spotlight,
19211918
}),
19221919
}
19231920
}

src/librustdoc/html/render.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1925,7 +1925,7 @@ impl fmt::Display for AllTypes {
19251925
print_entries(f, &self.derives, "Derive Macros", "derives")?;
19261926
print_entries(f, &self.functions, "Functions", "functions")?;
19271927
print_entries(f, &self.typedefs, "Typedefs", "typedefs")?;
1928-
print_entries(f, &self.trait_aliases, "Trait Aliases", "trait-alias")?;
1928+
print_entries(f, &self.trait_aliases, "Trait Aliases", "trait-aliases")?;
19291929
print_entries(f, &self.existentials, "Existentials", "existentials")?;
19301930
print_entries(f, &self.statics, "Statics", "statics")?;
19311931
print_entries(f, &self.constants, "Constants", "constants")
@@ -4863,7 +4863,7 @@ fn item_ty_to_strs(ty: &ItemType) -> (&'static str, &'static str) {
48634863
ItemType::Existential => ("existentials", "Existentials"),
48644864
ItemType::ProcAttribute => ("attributes", "Attribute Macros"),
48654865
ItemType::ProcDerive => ("derives", "Derive Macros"),
4866-
ItemType::TraitAlias => ("trait-alias", "Trait aliases"),
4866+
ItemType::TraitAlias => ("trait-aliases", "Trait aliases"),
48674867
}
48684868
}
48694869

src/test/rustdoc/trait_alias.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::fmt::Debug;
88
// @has foo/all.html '//a[@href="traitalias.Alias2.html"]' 'Alias2'
99
// @has foo/all.html '//a[@href="traitalias.Foo.html"]' 'Foo'
1010

11-
// @has foo/index.html '//h2[@id="trait-alias"]' 'Trait aliases'
11+
// @has foo/index.html '//h2[@id="trait-aliases"]' 'Trait aliases'
1212
// @has foo/index.html '//a[@class="traitalias"]' 'CopyAlias'
1313
// @has foo/index.html '//a[@class="traitalias"]' 'Alias2'
1414
// @has foo/index.html '//a[@class="traitalias"]' 'Foo'

0 commit comments

Comments
 (0)