user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify make_href.

Browse source 
It never fails, so it doesn't need to return `Result`. And the
`ItemType` in the result is just a copy of the one passed in via the
`shortty` arg, so it can also be removed.
This commit is contained in:
Nicholas Nethercote 2025-05-23 11:55:47 +10:00
parent f19d40a3d6
commit b9b482e9d9
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustdoc/html/format.rs
View file

@ -483,7 +483,7 @@ fn generate_item_def_id_path(
let mut is_remote = false;
let url_parts = url_parts(cx.cache(), def_id, module_fqp, &cx.current, &mut is_remote)?;
let (mut url_parts, shortty) = make_href(root_path, shortty, url_parts, &fqp, is_remote)?;
let mut url_parts = make_href(root_path, shortty, url_parts, &fqp, is_remote);
if def_id != original_def_id {
let kind = ItemType::from_def_kind(original_def_kind, Some(def_kind));
url_parts = format!("{url_parts}#{kind}.{}", tcx.item_name(original_def_id))
@ -521,7 +521,7 @@ fn make_href(
mut url_parts: UrlPartsBuilder,
fqp: &[Symbol],
is_remote: bool,
) -> Result<(String, ItemType), HrefError> {
) -> String {
if !is_remote && let Some(root_path) = root_path {
let root = root_path.trim_end_matches('/');
url_parts.push_front(root);
@ -536,7 +536,7 @@ fn make_href(
url_parts.push_fmt(format_args!("{shortty}.{last}.html"));
}
}
Ok((url_parts.finish(), shortty))
url_parts.finish()
}
pub(crate) fn href_with_root_path(
@ -606,8 +606,8 @@ pub(crate) fn href_with_root_path(
}
}
};
make_href(root_path, shortty, url_parts, fqp, is_remote)
.map(|(url_parts, short_ty)| (url_parts, short_ty, fqp.clone()))
let url_parts = make_href(root_path, shortty, url_parts, &fqp, is_remote);
Ok((url_parts, shortty, fqp.clone()))
}
pub(crate) fn href(