bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Group write calls when possible and use new format args

Browse source
This commit is contained in:
Guillaume Gomez 2023-07-27 15:39:13 +02:00
parent 82bf232245
commit b7871e5537
1 changed files with 84 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

160
src/librustdoc/html/render/mod.rs
View file

@ -268,7 +268,7 @@ impl AllTypes {
fn append(&mut self, item_name: String, item_type: &ItemType) { fn append(&mut self, item_name: String, item_type: &ItemType) {
let mut url: Vec<_> = item_name.split("::").skip(1).collect(); let mut url: Vec<_> = item_name.split("::").skip(1).collect();
if let Some(name) = url.pop() { if let Some(name) = url.pop() {
let new_url = format!("{}/{}.{}.html", url.join("/"), item_type, name); let new_url = format!("{}/{item_type}.{name}.html", url.join("/"));
url.push(name); url.push(name);
let name = url.join("::"); let name = url.join("::");
match *item_type { match *item_type {
@ -385,16 +385,17 @@ impl AllTypes {
fn scrape_examples_help(shared: &SharedContext<'_>) -> String { fn scrape_examples_help(shared: &SharedContext<'_>) -> String {
let mut content = SCRAPE_EXAMPLES_HELP_MD.to_owned(); let mut content = SCRAPE_EXAMPLES_HELP_MD.to_owned();
content.push_str(&format!( content.push_str(&format!(
"## More information\n\n\ "## More information\n\n\
If you want more information about this feature, please read the [corresponding chapter in the Rustdoc book]({}/rustdoc/scraped-examples.html).", If you want more information about this feature, please read the [corresponding chapter in \
DOC_RUST_LANG_ORG_CHANNEL)); the Rustdoc book]({DOC_RUST_LANG_ORG_CHANNEL}/rustdoc/scraped-examples.html)."
));
let mut ids = IdMap::default(); let mut ids = IdMap::default();
format!( format!(
"<div class=\"main-heading\">\ "<div class=\"main-heading\">\
<h1>About scraped examples</h1>\ <h1>About scraped examples</h1>\
</div>\ </div>\
<div>{}</div>", <div>{}</div>",
Markdown { Markdown {
content: &content, content: &content,
links: &[], links: &[],
@ -473,7 +474,7 @@ fn document_short<'a, 'cx: 'a>(
MarkdownSummaryLine(&s, &item.links(cx)).into_string_with_has_more_content(); MarkdownSummaryLine(&s, &item.links(cx)).into_string_with_has_more_content();
if has_more_content { if has_more_content {
let link = format!(r#" <a{}>Read more</a>"#, assoc_href_attr(item, link, cx)); let link = format!(" <a{}>Read more</a>", assoc_href_attr(item, link, cx));
if let Some(idx) = summary_html.rfind("</p>") { if let Some(idx) = summary_html.rfind("</p>") {
summary_html.insert_str(idx, &link); summary_html.insert_str(idx, &link);
@ -482,7 +483,7 @@ fn document_short<'a, 'cx: 'a>(
} }
} }
write!(f, "<div class='docblock'>{}</div>", summary_html)?; write!(f, "<div class='docblock'>{summary_html}</div>")?;
} }
Ok(()) Ok(())
}) })
@ -517,9 +518,9 @@ fn document_full_inner<'a, 'cx: 'a>(
write!( write!(
f, f,
"<details class=\"toggle top-doc\" open>\ "<details class=\"toggle top-doc\" open>\
<summary class=\"hideme\">\ <summary class=\"hideme\">\
<span>Expand description</span>\ <span>Expand description</span>\
</summary>{}</details>", </summary>{}</details>",
render_markdown(cx, &s, item.links(cx), heading_offset) render_markdown(cx, &s, item.links(cx), heading_offset)
)?; )?;
} else { } else {
@ -701,8 +702,8 @@ fn assoc_href_attr(it: &clean::Item, link: AssocItemLink<'_>, cx: &Context<'_>)
let item_type = it.type_(); let item_type = it.type_();
let href = match link { let href = match link {
AssocItemLink::Anchor(Some(ref id)) => Some(format!("#{}", id)), AssocItemLink::Anchor(Some(ref id)) => Some(format!("#{id}")),
AssocItemLink::Anchor(None) => Some(format!("#{}.{}", item_type, name)), AssocItemLink::Anchor(None) => Some(format!("#{item_type}.{name}")),
AssocItemLink::GotoSource(did, provided_methods) => { AssocItemLink::GotoSource(did, provided_methods) => {
// We're creating a link from the implementation of an associated item to its // We're creating a link from the implementation of an associated item to its
// declaration in the trait declaration. // declaration in the trait declaration.
@ -722,7 +723,7 @@ fn assoc_href_attr(it: &clean::Item, link: AssocItemLink<'_>, cx: &Context<'_>)
}; };
match href(did.expect_def_id(), cx) { match href(did.expect_def_id(), cx) {
Ok((url, ..)) => Some(format!("{}#{}.{}", url, item_type, name)), Ok((url, ..)) => Some(format!("{url}#{item_type}.{name}")),
// The link is broken since it points to an external crate that wasn't documented. // The link is broken since it points to an external crate that wasn't documented.
// Do not create any link in such case. This is better than falling back to a // Do not create any link in such case. This is better than falling back to a
// dummy anchor like `#{item_type}.{name}` representing the `id` of *this* impl item // dummy anchor like `#{item_type}.{name}` representing the `id` of *this* impl item
@ -735,14 +736,14 @@ fn assoc_href_attr(it: &clean::Item, link: AssocItemLink<'_>, cx: &Context<'_>)
// In this scenario, the actual `id` of this impl item would be // In this scenario, the actual `id` of this impl item would be
// `#{item_type}.{name}-{n}` for some number `n` (a disambiguator). // `#{item_type}.{name}-{n}` for some number `n` (a disambiguator).
Err(HrefError::DocumentationNotBuilt) => None, Err(HrefError::DocumentationNotBuilt) => None,
Err(_) => Some(format!("#{}.{}", item_type, name)), Err(_) => Some(format!("#{item_type}.{name}")),
} }
} }
}; };
// If there is no `href` for the reason explained above, simply do not render it which is valid: // If there is no `href` for the reason explained above, simply do not render it which is valid:
// https://html.spec.whatwg.org/multipage/links.html#links-created-by-a-and-area-elements // https://html.spec.whatwg.org/multipage/links.html#links-created-by-a-and-area-elements
href.map(|href| format!(" href=\"{}\"", href)).unwrap_or_default() href.map(|href| format!(" href=\"{href}\"")).unwrap_or_default()
} }
fn assoc_const( fn assoc_const(
@ -767,7 +768,7 @@ fn assoc_const(
ty = ty.print(cx), ty = ty.print(cx),
); );
if let Some(default) = default { if let Some(default) = default {
write!(w, " = "); w.write_str(" = ");
// FIXME: `.value()` uses `clean::utils::format_integer_with_underscore_sep` under the // FIXME: `.value()` uses `clean::utils::format_integer_with_underscore_sep` under the
// hood which adds noisy underscores and a type suffix to number literals. // hood which adds noisy underscores and a type suffix to number literals.
@ -910,39 +911,41 @@ fn render_stability_since_raw_with_extra(
if let Some(ver) = stable_version { if let Some(ver) = stable_version {
stability.push_str(ver.as_str()); stability.push_str(ver.as_str());
title.push_str(&format!("Stable since Rust version {}", ver)); title.push_str(&format!("Stable since Rust version {ver}"));
} }
let const_title_and_stability = match const_stability { let const_title_and_stability = match const_stability {
Some(ConstStability { level: StabilityLevel::Stable { since, .. }, .. }) Some(ConstStability { level: StabilityLevel::Stable { since, .. }, .. })
if Some(since) != containing_const_ver => if Some(since) != containing_const_ver =>
{ {
Some((format!("const since {}", since), format!("const: {}", since))) Some((format!("const since {since}"), format!("const: {since}")))
} }
Some(ConstStability { level: StabilityLevel::Unstable { issue, .. }, feature, .. }) => { Some(ConstStability { level: StabilityLevel::Unstable { issue, .. }, feature, .. }) => {
let unstable = if let Some(n) = issue { let unstable = if let Some(n) = issue {
format!( format!(
r#"<a href="https://github.com/rust-lang/rust/issues/{}" title="Tracking issue for {}">unstable</a>"#, "<a \
n, feature href=\"https://github.com/rust-lang/rust/issues/{n}\" \
title=\"Tracking issue for {feature}\"\
>unstable</a>"
) )
} else { } else {
String::from("unstable") String::from("unstable")
}; };
Some((String::from("const unstable"), format!("const: {}", unstable))) Some((String::from("const unstable"), format!("const: {unstable}")))
} }
_ => None, _ => None,
}; };
if let Some((const_title, const_stability)) = const_title_and_stability { if let Some((const_title, const_stability)) = const_title_and_stability {
if !title.is_empty() { if !title.is_empty() {
title.push_str(&format!(", {}", const_title)); title.push_str(&format!(", {const_title}"));
} else { } else {
title.push_str(&const_title); title.push_str(&const_title);
} }
if !stability.is_empty() { if !stability.is_empty() {
stability.push_str(&format!(" ({})", const_stability)); stability.push_str(&format!(" ({const_stability})"));
} else { } else {
stability.push_str(&const_stability); stability.push_str(&const_stability);
} }
@ -1091,7 +1094,7 @@ pub(crate) fn render_all_impls(
let impls = impls.into_inner(); let impls = impls.into_inner();
if !impls.is_empty() { if !impls.is_empty() {
write_impl_section_heading(&mut w, "Trait Implementations", "trait-implementations"); write_impl_section_heading(&mut w, "Trait Implementations", "trait-implementations");
write!(w, "<div id=\"trait-implementations-list\">{}</div>", impls).unwrap(); write!(w, "<div id=\"trait-implementations-list\">{impls}</div>").unwrap();
} }
if !synthetic.is_empty() { if !synthetic.is_empty() {
@ -1189,10 +1192,13 @@ fn render_assoc_items_inner(
); );
} }
if !impls_buf.is_empty() { if !impls_buf.is_empty() {
write!(w, "{}", tmp_buf.into_inner()).unwrap(); write!(
write!(w, "<div id=\"{id}\"{class_html}>").unwrap(); w,
write!(w, "{}", impls_buf.into_inner()).unwrap(); "{}<div id=\"{id}\"{class_html}>{}</div>",
w.write_str("</div>").unwrap(); tmp_buf.into_inner(),
impls_buf.into_inner()
)
.unwrap();
} }
} }
@ -1392,7 +1398,7 @@ fn notable_traits_decl(ty: &clean::Type, cx: &Context<'_>) -> (String, String) {
} }
} }
if out.is_empty() { if out.is_empty() {
write!(&mut out, "</code></pre>",); out.write_str("</code></pre>");
} }
(format!("{:#}", ty.print(cx)), out.into_inner()) (format!("{:#}", ty.print(cx)), out.into_inner())
@ -1538,25 +1544,25 @@ fn render_impl(
let toggled = !doc_buffer.is_empty(); let toggled = !doc_buffer.is_empty();
if toggled { if toggled {
let method_toggle_class = if item_type.is_method() { " method-toggle" } else { "" }; let method_toggle_class = if item_type.is_method() { " method-toggle" } else { "" };
write!(w, "<details class=\"toggle{}\" open><summary>", method_toggle_class); write!(w, "<details class=\"toggle{method_toggle_class}\" open><summary>");
} }
match &*item.kind { match &*item.kind {
clean::MethodItem(..) | clean::TyMethodItem(_) => { clean::MethodItem(..) | clean::TyMethodItem(_) => {
// Only render when the method is not static or we allow static methods // Only render when the method is not static or we allow static methods
if render_method_item { if render_method_item {
let id = cx.derive_id(format!("{}.{}", item_type, name)); let id = cx.derive_id(format!("{item_type}.{name}"));
let source_id = trait_ let source_id = trait_
.and_then(|trait_| { .and_then(|trait_| {
trait_.items.iter().find(|item| { trait_.items.iter().find(|item| {
item.name.map(|n| n.as_str().eq(name.as_str())).unwrap_or(false) item.name.map(|n| n.as_str().eq(name.as_str())).unwrap_or(false)
}) })
}) })
.map(|item| format!("{}.{}", item.type_(), name)); .map(|item| format!("{}.{name}", item.type_()));
write!(w, "<section id=\"{}\" class=\"{}{}\">", id, item_type, in_trait_class,); write!(w, "<section id=\"{id}\" class=\"{item_type}{in_trait_class}\">");
render_rightside(w, cx, item, containing_item, render_mode); render_rightside(w, cx, item, containing_item, render_mode);
if trait_.is_some() { if trait_.is_some() {
// Anchors are only used on trait impls. // Anchors are only used on trait impls.
write!(w, "<a href=\"#{}\" class=\"anchor\">§</a>", id); write!(w, "<a href=\"#{id}\" class=\"anchor\">§</a>");
} }
w.write_str("<h4 class=\"code-header\">"); w.write_str("<h4 class=\"code-header\">");
render_assoc_item( render_assoc_item(
@ -1567,19 +1573,18 @@ fn render_impl(
cx, cx,
render_mode, render_mode,
); );
w.write_str("</h4>"); w.write_str("</h4></section>");
w.write_str("</section>");
} }
} }
kind @ (clean::TyAssocConstItem(generics, ty) kind @ (clean::TyAssocConstItem(generics, ty)
| clean::AssocConstItem(generics, ty, _)) => { | clean::AssocConstItem(generics, ty, _)) => {
let source_id = format!("{}.{}", item_type, name); let source_id = format!("{item_type}.{name}");
let id = cx.derive_id(source_id.clone()); let id = cx.derive_id(source_id.clone());
write!(w, "<section id=\"{}\" class=\"{}{}\">", id, item_type, in_trait_class); write!(w, "<section id=\"{id}\" class=\"{item_type}{in_trait_class}\">");
render_rightside(w, cx, item, containing_item, render_mode); render_rightside(w, cx, item, containing_item, render_mode);
if trait_.is_some() { if trait_.is_some() {
// Anchors are only used on trait impls. // Anchors are only used on trait impls.
write!(w, "<a href=\"#{}\" class=\"anchor\">§</a>", id); write!(w, "<a href=\"#{id}\" class=\"anchor\">§</a>");
} }
w.write_str("<h4 class=\"code-header\">"); w.write_str("<h4 class=\"code-header\">");
assoc_const( assoc_const(
@ -1596,16 +1601,15 @@ fn render_impl(
0, 0,
cx, cx,
); );
w.write_str("</h4>"); w.write_str("</h4></section>");
w.write_str("</section>");
} }
clean::TyAssocTypeItem(generics, bounds) => { clean::TyAssocTypeItem(generics, bounds) => {
let source_id = format!("{}.{}", item_type, name); let source_id = format!("{item_type}.{name}");
let id = cx.derive_id(source_id.clone()); let id = cx.derive_id(source_id.clone());
write!(w, "<section id=\"{}\" class=\"{}{}\">", id, item_type, in_trait_class); write!(w, "<section id=\"{id}\" class=\"{item_type}{in_trait_class}\">");
if trait_.is_some() { if trait_.is_some() {
// Anchors are only used on trait impls. // Anchors are only used on trait impls.
write!(w, "<a href=\"#{}\" class=\"anchor\">§</a>", id); write!(w, "<a href=\"#{id}\" class=\"anchor\">§</a>");
} }
w.write_str("<h4 class=\"code-header\">"); w.write_str("<h4 class=\"code-header\">");
assoc_type( assoc_type(
@ -1618,16 +1622,15 @@ fn render_impl(
0, 0,
cx, cx,
); );
w.write_str("</h4>"); w.write_str("</h4></section>");
w.write_str("</section>");
} }
clean::AssocTypeItem(tydef, _bounds) => { clean::AssocTypeItem(tydef, _bounds) => {
let source_id = format!("{}.{}", item_type, name); let source_id = format!("{item_type}.{name}");
let id = cx.derive_id(source_id.clone()); let id = cx.derive_id(source_id.clone());
write!(w, "<section id=\"{}\" class=\"{}{}\">", id, item_type, in_trait_class); write!(w, "<section id=\"{id}\" class=\"{item_type}{in_trait_class}\">");
if trait_.is_some() { if trait_.is_some() {
// Anchors are only used on trait impls. // Anchors are only used on trait impls.
write!(w, "<a href=\"#{}\" class=\"anchor\">§</a>", id); write!(w, "<a href=\"#{id}\" class=\"anchor\">§</a>");
} }
w.write_str("<h4 class=\"code-header\">"); w.write_str("<h4 class=\"code-header\">");
assoc_type( assoc_type(
@ -1640,8 +1643,7 @@ fn render_impl(
0, 0,
cx, cx,
); );
w.write_str("</h4>"); w.write_str("</h4></section>");
w.write_str("</section>");
} }
clean::StrippedItem(..) => return, clean::StrippedItem(..) => return,
_ => panic!("can't make docs for trait item with name {:?}", item.name), _ => panic!("can't make docs for trait item with name {:?}", item.name),
@ -1744,10 +1746,10 @@ fn render_impl(
close_tags.insert_str(0, "</details>"); close_tags.insert_str(0, "</details>");
write!( write!(
w, w,
"<details class=\"toggle implementors-toggle\"{}>", "<details class=\"toggle implementors-toggle\"{}>\
<summary>",
if rendering_params.toggle_open_by_default { " open" } else { "" } if rendering_params.toggle_open_by_default { " open" } else { "" }
); );
write!(w, "<summary>")
} }
render_impl_summary( render_impl_summary(
w, w,
@ -1760,15 +1762,15 @@ fn render_impl(
aliases, aliases,
); );
if toggled { if toggled {
write!(w, "</summary>") w.write_str("</summary>");
} }
if let Some(ref dox) = i.impl_item.opt_doc_value() { if let Some(ref dox) = i.impl_item.opt_doc_value() {
if trait_.is_none() && i.inner_impl().items.is_empty() { if trait_.is_none() && i.inner_impl().items.is_empty() {
w.write_str( w.write_str(
"<div class=\"item-info\">\ "<div class=\"item-info\">\
<div class=\"stab empty-impl\">This impl block contains no items.</div>\ <div class=\"stab empty-impl\">This impl block contains no items.</div>\
</div>", </div>",
); );
} }
write!( write!(
@ -1827,11 +1829,11 @@ fn render_rightside(
const_stable_since, const_stable_since,
if has_src_ref { "" } else { " rightside" }, if has_src_ref { "" } else { " rightside" },
); );
if let Some(l) = src_href { if let Some(link) = src_href {
if has_stability { if has_stability {
write!(rightside, " · <a class=\"src\" href=\"{}\">source</a>", l) write!(rightside, " · <a class=\"src\" href=\"{link}\">source</a>")
} else { } else {
write!(rightside, "<a class=\"src rightside\" href=\"{}\">source</a>", l) write!(rightside, "<a class=\"src rightside\" href=\"{link}\">source</a>")
} }
} }
if has_stability && has_src_ref { if has_stability && has_src_ref {
@ -1860,10 +1862,13 @@ pub(crate) fn render_impl_summary(
} else { } else {
format!(" data-aliases=\"{}\"", aliases.join(",")) format!(" data-aliases=\"{}\"", aliases.join(","))
}; };
write!(w, "<section id=\"{}\" class=\"impl\"{}>", id, aliases); write!(w, "<section id=\"{id}\" class=\"impl\"{aliases}>");
render_rightside(w, cx, &i.impl_item, containing_item, RenderMode::Normal); render_rightside(w, cx, &i.impl_item, containing_item, RenderMode::Normal);
write!(w, "<a href=\"#{}\" class=\"anchor\">§</a>", id); write!(
write!(w, "<h3 class=\"code-header\">"); w,
"<a href=\"#{id}\" class=\"anchor\">§</a>\
<h3 class=\"code-header\">"
);
if let Some(use_absolute) = use_absolute { if let Some(use_absolute) = use_absolute {
write!(w, "{}", inner_impl.print(use_absolute, cx)); write!(w, "{}", inner_impl.print(use_absolute, cx));
@ -1888,15 +1893,16 @@ pub(crate) fn render_impl_summary(
} else { } else {
write!(w, "{}", inner_impl.print(false, cx)); write!(w, "{}", inner_impl.print(false, cx));
} }
write!(w, "</h3>"); w.write_str("</h3>");
let is_trait = inner_impl.trait_.is_some(); let is_trait = inner_impl.trait_.is_some();
if is_trait { if is_trait {
if let Some(portability) = portability(&i.impl_item, Some(parent)) { if let Some(portability) = portability(&i.impl_item, Some(parent)) {
write!( write!(
w, w,
"<span class=\"item-info\"><div class=\"stab portability\">{}</div></span>", "<span class=\"item-info\">\
portability <div class=\"stab portability\">{portability}</div>\
</span>",
); );
} }
} }
@ -1949,7 +1955,7 @@ pub(crate) fn small_url_encode(s: String) -> String {
// consistent with itself when encoding them. // consistent with itself when encoding them.
st += "+"; st += "+";
} else { } else {
write!(st, "%{:02X}", b).unwrap(); write!(st, "%{b:02X}").unwrap();
} }
// Invariant: if the current byte is not at the start of a multi-byte character, // Invariant: if the current byte is not at the start of a multi-byte character,
// we need to get down here so that when the next turn of the loop comes around, // we need to get down here so that when the next turn of the loop comes around,
@ -2264,7 +2270,7 @@ fn render_call_locations<W: fmt::Write>(mut w: W, cx: &mut Context<'_>, item: &c
format!("lines {}-{}", line_lo + 1, line_hi + 1), format!("lines {}-{}", line_lo + 1, line_hi + 1),
) )
}; };
let url = format!("{}{}#{}", cx.root_path(), call_data.url, anchor); let url = format!("{}{}#{anchor}", cx.root_path(), call_data.url);
(url, title) (url, title)
}; };
@ -2274,7 +2280,7 @@ fn render_call_locations<W: fmt::Write>(mut w: W, cx: &mut Context<'_>, item: &c
Ok(contents) => contents, Ok(contents) => contents,
Err(err) => { Err(err) => {
let span = item.span(tcx).map_or(rustc_span::DUMMY_SP, |span| span.inner()); let span = item.span(tcx).map_or(rustc_span::DUMMY_SP, |span| span.inner());
tcx.sess.span_err(span, format!("failed to read file {}: {}", path.display(), err)); tcx.sess.span_err(span, format!("failed to read file {}: {err}", path.display()));
return false; return false;
} }
}; };
@ -2333,7 +2339,7 @@ fn render_call_locations<W: fmt::Write>(mut w: W, cx: &mut Context<'_>, item: &c
.unwrap(); .unwrap();
if line_ranges.len() > 1 { if line_ranges.len() > 1 {
write!(w, r#"<button class="prev">&pr;</button> <button class="next">&sc;</button>"#) w.write_str(r#"<button class="prev">&pr;</button> <button class="next">&sc;</button>"#)
.unwrap(); .unwrap();
} }
@ -2369,7 +2375,7 @@ fn render_call_locations<W: fmt::Write>(mut w: W, cx: &mut Context<'_>, item: &c
highlight::DecorationInfo(decoration_info), highlight::DecorationInfo(decoration_info),
sources::SourceContext::Embedded { offset: line_min, needs_expansion }, sources::SourceContext::Embedded { offset: line_min, needs_expansion },
); );
write!(w, "</div></div>").unwrap(); w.write_str("</div></div>").unwrap();
true true
}; };
@ -2436,8 +2442,10 @@ fn render_call_locations<W: fmt::Write>(mut w: W, cx: &mut Context<'_>, item: &c
// For the remaining examples, generate a <ul> containing links to the source files. // For the remaining examples, generate a <ul> containing links to the source files.
if it.peek().is_some() { if it.peek().is_some() {
write!(w, r#"<div class="example-links">Additional examples can be found in:<br><ul>"#) w.write_str(
.unwrap(); r#"<div class="example-links">Additional examples can be found in:<br><ul>"#,
)
.unwrap();
it.for_each(|(_, call_data)| { it.for_each(|(_, call_data)| {
let (url, _) = link_to_loc(call_data, &call_data.locations[0]); let (url, _) = link_to_loc(call_data, &call_data.locations[0]);
write!( write!(
@ -2448,11 +2456,11 @@ fn render_call_locations<W: fmt::Write>(mut w: W, cx: &mut Context<'_>, item: &c
) )
.unwrap(); .unwrap();
}); });
write!(w, "</ul></div>").unwrap(); w.write_str("</ul></div>").unwrap();
} }
write!(w, "</div></details>").unwrap(); w.write_str("</div></details>").unwrap();
} }
write!(w, "</div>").unwrap(); w.write_str("</div>").unwrap();
} }