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

Simplify make_href.

Browse source 
Currently it is passed an `fqp` slice which it calls `to_vec` on and
returns. This is a bit odd. It's better to let the call site clone if
necessary. (One call site does, one does not).
This commit is contained in:
Nicholas Nethercote 2025-05-26 09:10:04 +10:00
parent 581fd271f6
commit fa8e910ed9
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
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 (url_parts, shortty, fqp) = make_href(root_path, shortty, url_parts, &fqp, is_remote)?;
let (url_parts, shortty) = make_href(root_path, shortty, url_parts, &fqp, is_remote)?;
if def_id == original_def_id {
return Ok((url_parts, shortty, fqp));
}
@ -521,7 +521,7 @@ fn make_href(
mut url_parts: UrlPartsBuilder,
fqp: &[Symbol],
is_remote: bool,
) -> Result<(String, ItemType, Vec<Symbol>), HrefError> {
) -> Result<(String, ItemType), HrefError> {
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, fqp.to_vec()))
Ok((url_parts.finish(), shortty))
}
pub(crate) fn href_with_root_path(
@ -607,6 +607,7 @@ 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()))
}
pub(crate) fn href(