bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #138917 - nnethercote:rustdoc-remove-useless, r=GuillaumeGomez

Browse source 
rustdoc: remove useless `Symbol::is_empty` checks.

There are a number of `is_empty` checks that can never fail. This commit removes them, in support of #137978.

r? `@GuillaumeGomez`
This commit is contained in:
Jacob Pratt 2025-03-25 20:34:50 -04:00 • committed by GitHub
commit 04cbe2816d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/librustdoc/clean/inline.rs
View file

@ -211,17 +211,7 @@ pub(crate) fn load_attrs<'hir>(cx: &DocContext<'hir>, did: DefId) -> &'hir [hir:
}
pub(crate) fn item_relative_path(tcx: TyCtxt<'_>, def_id: DefId) -> Vec<Symbol> {
tcx.def_path(def_id)
.data
.into_iter()
.filter_map(|elem| {
// extern blocks (and a few others things) have an empty name.
match elem.data.get_opt_name() {
Some(s) if !s.is_empty() => Some(s),
_ => None,
}
})
.collect()
tcx.def_path(def_id).data.into_iter().filter_map(|elem| elem.data.get_opt_name()).collect()
}
/// Record an external fully qualified name in the external_paths cache.

2
src/librustdoc/formats/cache.rs
View file

@ -288,7 +288,7 @@ impl DocFolder for CacheBuilder<'_, '_> {
// Keep track of the fully qualified path for this item.
let pushed = match item.name {
Some(n) if !n.is_empty() => {
Some(n) => {
self.cache.stack.push(n);
true
}

62
src/librustdoc/html/render/sidebar.rs
View file

@ -734,20 +734,20 @@ fn get_methods<'a>(
) -> Vec<Link<'a>> {
i.items
.iter()
.filter_map(|item| match item.name {
Some(ref name) if !name.is_empty() && item.is_method() => {
if !for_deref || super::should_render_item(item, deref_mut, tcx) {
Some(Link::new(
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::Method)),
name.as_str(),
))
} else {
None
}
.filter_map(|item| {
if let Some(ref name) = item.name
&& item.is_method()
&& (!for_deref || super::should_render_item(item, deref_mut, tcx))
{
Some(Link::new(
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::Method)),
name.as_str(),
))
} else {
None
}
_ => None,
})
.collect::<Vec<_>>()
.collect()
}
fn get_associated_constants<'a>(
@ -756,14 +756,19 @@ fn get_associated_constants<'a>(
) -> Vec<Link<'a>> {
i.items
.iter()
.filter_map(|item| match item.name {
Some(ref name) if !name.is_empty() && item.is_associated_const() => Some(Link::new(
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::AssocConst)),
name.as_str(),
)),
_ => None,
.filter_map(|item| {
if let Some(ref name) = item.name
&& item.is_associated_const()
{
Some(Link::new(
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::AssocConst)),
name.as_str(),
))
} else {
None
}
})
.collect::<Vec<_>>()
.collect()
}
fn get_associated_types<'a>(
@ -772,12 +777,17 @@ fn get_associated_types<'a>(
) -> Vec<Link<'a>> {
i.items
.iter()
.filter_map(|item| match item.name {
Some(ref name) if !name.is_empty() && item.is_associated_type() => Some(Link::new(
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::AssocType)),
name.as_str(),
)),
_ => None,
.filter_map(|item| {
if let Some(ref name) = item.name
&& item.is_associated_type()
{
Some(Link::new(
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::AssocType)),
name.as_str(),
))
} else {
None
}
})
.collect::<Vec<_>>()
.collect()
}