diff options
| author | Jacob Pratt <jacob@jhpratt.dev> | 2025-03-25 20:34:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-25 20:34:50 -0400 |
| commit | 04cbe2816df9ce5c9db762f9af7ef6f0a1a50a38 (patch) | |
| tree | 659faff1d42f345f534e000cd53fe73801f27705 /src/librustdoc/html/render | |
| parent | 5bd69d940e83db1971fbd1c5a999fdb308200cf7 (diff) | |
| parent | 6bea9c7a5465e27efbadced28322e6faf78bb174 (diff) | |
| download | rust-04cbe2816df9ce5c9db762f9af7ef6f0a1a50a38.tar.gz rust-04cbe2816df9ce5c9db762f9af7ef6f0a1a50a38.zip | |
Rollup merge of #138917 - nnethercote:rustdoc-remove-useless, r=GuillaumeGomez
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`
Diffstat (limited to 'src/librustdoc/html/render')
| -rw-r--r-- | src/librustdoc/html/render/sidebar.rs | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/src/librustdoc/html/render/sidebar.rs b/src/librustdoc/html/render/sidebar.rs index 9c78dcdc571..89ff61ecb03 100644 --- a/src/librustdoc/html/render/sidebar.rs +++ b/src/librustdoc/html/render/sidebar.rs @@ -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() } |
