Rollup merge of #103799 - GuillaumeGomez:search-index-tuple-struct-field, r=notriddle
Remove generation of tuple struct fields in the search index This comes from [this discussion](https://github.com/rust-lang/rust/pull/103710) as they're not very useful. r? `@notriddle`
This commit is contained in:
commit
fca9093ea3
@ -316,21 +316,28 @@ fn fold_item(&mut self, item: clean::Item) -> Option<clean::Item> {
|
|||||||
let desc = item.doc_value().map_or_else(String::new, |x| {
|
let desc = item.doc_value().map_or_else(String::new, |x| {
|
||||||
short_markdown_summary(x.as_str(), &item.link_names(self.cache))
|
short_markdown_summary(x.as_str(), &item.link_names(self.cache))
|
||||||
});
|
});
|
||||||
self.cache.search_index.push(IndexItem {
|
let ty = item.type_();
|
||||||
ty: item.type_(),
|
let name = s.to_string();
|
||||||
name: s.to_string(),
|
if ty != ItemType::StructField || u16::from_str_radix(&name, 10).is_err() {
|
||||||
path: join_with_double_colon(path),
|
// In case this is a field from a tuple struct, we don't add it into
|
||||||
desc,
|
// the search index because its name is something like "0", which is
|
||||||
parent,
|
// not useful for rustdoc search.
|
||||||
parent_idx: None,
|
self.cache.search_index.push(IndexItem {
|
||||||
search_type: get_function_type_for_search(
|
ty,
|
||||||
&item,
|
name,
|
||||||
self.tcx,
|
path: join_with_double_colon(path),
|
||||||
clean_impl_generics(self.cache.parent_stack.last()).as_ref(),
|
desc,
|
||||||
self.cache,
|
parent,
|
||||||
),
|
parent_idx: None,
|
||||||
aliases: item.attrs.get_doc_aliases(),
|
search_type: get_function_type_for_search(
|
||||||
});
|
&item,
|
||||||
|
self.tcx,
|
||||||
|
clean_impl_generics(self.cache.parent_stack.last()).as_ref(),
|
||||||
|
self.cache,
|
||||||
|
),
|
||||||
|
aliases: item.attrs.get_doc_aliases(),
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
(Some(parent), None) if is_inherent_impl_item => {
|
(Some(parent), None) if is_inherent_impl_item => {
|
||||||
|
18
src/test/rustdoc/no-unit-struct-field.rs
Normal file
18
src/test/rustdoc/no-unit-struct-field.rs
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
// This test ensures that the tuple struct fields are not generated in the
|
||||||
|
// search index.
|
||||||
|
|
||||||
|
// @!hasraw search-index.js '"0"'
|
||||||
|
// @!hasraw search-index.js '"1"'
|
||||||
|
// @hasraw search-index.js '"foo_a"'
|
||||||
|
// @hasraw search-index.js '"bar_a"'
|
||||||
|
|
||||||
|
pub struct Bar(pub u32, pub u8);
|
||||||
|
pub struct Foo {
|
||||||
|
pub foo_a: u8,
|
||||||
|
}
|
||||||
|
pub enum Enum {
|
||||||
|
Foo(u8),
|
||||||
|
Bar {
|
||||||
|
bar_a: u8,
|
||||||
|
},
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user