Skip to content

Commit e841bce

Browse files
committed
rustdoc: remove useless Symbol::is_empty checks.
There are a number of `is_empty` checks that can never fail. This commit removes them.
1 parent aa8f0fd commit e841bce

File tree

4 files changed

+50
-35
lines changed

4 files changed

+50
-35
lines changed

src/librustdoc/clean/inline.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,10 @@ pub(crate) fn item_relative_path(tcx: TyCtxt<'_>, def_id: DefId) -> Vec<Symbol>
215215
.data
216216
.into_iter()
217217
.filter_map(|elem| {
218-
// extern blocks (and a few others things) have an empty name.
219-
match elem.data.get_opt_name() {
220-
Some(s) if !s.is_empty() => Some(s),
221-
_ => None,
222-
}
218+
elem.data.get_opt_name().map(|name| {
219+
assert!(!name.is_empty()); // njn: temp; remove `map`
220+
name
221+
})
223222
})
224223
.collect()
225224
}

src/librustdoc/formats/cache.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@ impl DocFolder for CacheBuilder<'_, '_> {
288288

289289
// Keep track of the fully qualified path for this item.
290290
let pushed = match item.name {
291-
Some(n) if !n.is_empty() => {
291+
Some(n) => {
292+
assert!(!n.is_empty()); // njn: temp
292293
self.cache.stack.push(n);
293294
true
294295
}

src/librustdoc/html/format.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1238,9 +1238,8 @@ impl clean::Arguments {
12381238
.iter()
12391239
.map(|input| {
12401240
fmt::from_fn(|f| {
1241-
if !input.name.is_empty() {
1242-
write!(f, "{}: ", input.name)?;
1243-
}
1241+
assert!(!input.name.is_empty()); // njn: temp
1242+
write!(f, "{}: ", input.name)?;
12441243
input.type_.print(cx).fmt(f)
12451244
})
12461245
})

src/librustdoc/html/render/sidebar.rs

+42-26
Original file line numberDiff line numberDiff line change
@@ -731,20 +731,22 @@ fn get_methods<'a>(
731731
) -> Vec<Link<'a>> {
732732
i.items
733733
.iter()
734-
.filter_map(|item| match item.name {
735-
Some(ref name) if !name.is_empty() && item.is_method() => {
736-
if !for_deref || super::should_render_item(item, deref_mut, tcx) {
737-
Some(Link::new(
738-
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::Method)),
739-
name.as_str(),
740-
))
741-
} else {
742-
None
743-
}
734+
.filter_map(|item| {
735+
if let Some(ref name) = item.name
736+
&& { assert!(!name.is_empty()); true } // njn: temp
737+
//&& !name.is_empty()
738+
&& item.is_method()
739+
&& (!for_deref || super::should_render_item(item, deref_mut, tcx))
740+
{
741+
Some(Link::new(
742+
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::Method)),
743+
name.as_str(),
744+
))
745+
} else {
746+
None
744747
}
745-
_ => None,
746748
})
747-
.collect::<Vec<_>>()
749+
.collect()
748750
}
749751

750752
fn get_associated_constants<'a>(
@@ -753,14 +755,21 @@ fn get_associated_constants<'a>(
753755
) -> Vec<Link<'a>> {
754756
i.items
755757
.iter()
756-
.filter_map(|item| match item.name {
757-
Some(ref name) if !name.is_empty() && item.is_associated_const() => Some(Link::new(
758-
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::AssocConst)),
759-
name.as_str(),
760-
)),
761-
_ => None,
758+
.filter_map(|item| {
759+
if let Some(ref name) = item.name
760+
&& { assert!(!name.is_empty()); true } // njn: temp
761+
//&& !name.is_empty()
762+
&& item.is_associated_const()
763+
{
764+
Some(Link::new(
765+
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::AssocConst)),
766+
name.as_str(),
767+
))
768+
} else {
769+
None
770+
}
762771
})
763-
.collect::<Vec<_>>()
772+
.collect()
764773
}
765774

766775
fn get_associated_types<'a>(
@@ -769,12 +778,19 @@ fn get_associated_types<'a>(
769778
) -> Vec<Link<'a>> {
770779
i.items
771780
.iter()
772-
.filter_map(|item| match item.name {
773-
Some(ref name) if !name.is_empty() && item.is_associated_type() => Some(Link::new(
774-
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::AssocType)),
775-
name.as_str(),
776-
)),
777-
_ => None,
781+
.filter_map(|item| {
782+
if let Some(ref name) = item.name
783+
&& { assert!(!name.is_empty()); true } // njn: temp
784+
//&& !name.is_empty()
785+
&& item.is_associated_type()
786+
{
787+
Some(Link::new(
788+
get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::AssocType)),
789+
name.as_str(),
790+
))
791+
} else {
792+
None
793+
}
778794
})
779-
.collect::<Vec<_>>()
795+
.collect()
780796
}

0 commit comments

Comments
 (0)