diff options
Diffstat (limited to 'src/librustdoc/html/render/mod.rs')
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 87 |
1 files changed, 43 insertions, 44 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 53112c87fdc..0b14c327e47 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -1214,7 +1214,7 @@ fn notable_traits_decl(decl: &clean::FnDecl, cx: &Context<'_>) -> String { if out.is_empty() { write!( &mut out, - "<h3 class=\"notable\">Notable traits for {}</h3>\ + "<div class=\"notable\">Notable traits for {}</div>\ <code class=\"content\">", impl_.for_.print(cx) ); @@ -1370,7 +1370,7 @@ fn render_impl( "<div id=\"{}\" class=\"{}{} has-srclink\">", id, item_type, in_trait_class, ); - w.write_str("<code>"); + w.write_str("<h4 class=\"code-header\">"); render_assoc_item( w, item, @@ -1378,7 +1378,7 @@ fn render_impl( ItemType::Impl, cx, ); - w.write_str("</code>"); + w.write_str("</h4>"); render_stability_since_raw( w, item.stable_since(tcx).as_deref(), @@ -1396,9 +1396,10 @@ fn render_impl( let id = cx.derive_id(source_id.clone()); write!( w, - "<div id=\"{}\" class=\"{}{} has-srclink\"><code>", + "<div id=\"{}\" class=\"{}{} has-srclink\">", id, item_type, in_trait_class ); + w.write_str("<h4 class=\"code-header\">"); assoc_type( w, item, @@ -1408,7 +1409,7 @@ fn render_impl( "", cx, ); - w.write_str("</code>"); + w.write_str("</h4>"); write!(w, "<a href=\"#{}\" class=\"anchor\"></a>", id); w.write_str("</div>"); } @@ -1417,9 +1418,10 @@ fn render_impl( let id = cx.derive_id(source_id.clone()); write!( w, - "<div id=\"{}\" class=\"{}{} has-srclink\"><code>", + "<div id=\"{}\" class=\"{}{} has-srclink\">", id, item_type, in_trait_class ); + w.write_str("<h4 class=\"code-header\">"); assoc_const( w, item, @@ -1429,7 +1431,7 @@ fn render_impl( "", cx, ); - w.write_str("</code>"); + w.write_str("</h4>"); render_stability_since_raw( w, item.stable_since(tcx).as_deref(), @@ -1444,7 +1446,8 @@ fn render_impl( clean::AssocTypeItem(ref bounds, ref default) => { let source_id = format!("{}.{}", item_type, name); let id = cx.derive_id(source_id.clone()); - write!(w, "<div id=\"{}\" class=\"{}{}\"><code>", id, item_type, in_trait_class,); + write!(w, "<div id=\"{}\" class=\"{}{}\">", id, item_type, in_trait_class,); + w.write_str("<h4 class=\"code-header\">"); assoc_type( w, item, @@ -1454,7 +1457,7 @@ fn render_impl( "", cx, ); - w.write_str("</code>"); + w.write_str("</h4>"); write!(w, "<a href=\"#{}\" class=\"anchor\"></a>", id); w.write_str("</div>"); } @@ -1638,12 +1641,8 @@ fn render_impl_summary( format!(" data-aliases=\"{}\"", aliases.join(",")) }; if let Some(use_absolute) = use_absolute { - write!( - w, - "<div id=\"{}\" class=\"impl has-srclink\"{}>\ - <code class=\"in-band\">", - id, aliases - ); + write!(w, "<div id=\"{}\" class=\"impl has-srclink\"{}>", id, aliases); + write!(w, "<h3 class=\"code-header in-band\">"); write!(w, "{}", i.inner_impl().print(use_absolute, cx)); if show_def_docs { for it in &i.inner_impl().items { @@ -1654,12 +1653,12 @@ fn render_impl_summary( } } } - w.write_str("</code>"); + w.write_str("</h3>"); } else { write!( w, "<div id=\"{}\" class=\"impl has-srclink\"{}>\ - <code class=\"in-band\">{}</code>", + <h3 class=\"code-header in-band\">{}</h3>", id, aliases, i.inner_impl().print(false, cx) @@ -1690,7 +1689,7 @@ fn print_sidebar(cx: &Context<'_>, it: &clean::Item, buffer: &mut Buffer) { { write!( buffer, - "<p class=\"location\">{}{}</p>", + "<h2 class=\"location\">{}{}</h2>", match *it.kind { clean::StructItem(..) => "Struct ", clean::TraitItem(..) => "Trait ", @@ -1753,7 +1752,7 @@ fn print_sidebar(cx: &Context<'_>, it: &clean::Item, buffer: &mut Buffer) { // to navigate the documentation (though slightly inefficiently). if !it.is_mod() { - buffer.write_str("<p class=\"location\">Other items in<br>"); + buffer.write_str("<h2 class=\"location\">Other items in<br>"); for (i, name) in cx.current.iter().take(parentlen).enumerate() { if i > 0 { buffer.write_str("::<wbr>"); @@ -1765,7 +1764,7 @@ fn print_sidebar(cx: &Context<'_>, it: &clean::Item, buffer: &mut Buffer) { *name ); } - buffer.write_str("</p>"); + buffer.write_str("</h2>"); } // Sidebar refers to the enclosing module, not this module. @@ -1876,7 +1875,7 @@ fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) { ret.sort(); out.push_str( - "<a class=\"sidebar-title\" href=\"#implementations\">Methods</a>\ + "<h3 class=\"sidebar-title\"><a href=\"#implementations\">Methods</a></h3>\ <div class=\"sidebar-links\">", ); for line in ret { @@ -1941,24 +1940,24 @@ fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) { if !concrete_format.is_empty() { out.push_str( - "<a class=\"sidebar-title\" href=\"#trait-implementations\">\ - Trait Implementations</a>", + "<h3 class=\"sidebar-title\"><a href=\"#trait-implementations\">\ + Trait Implementations</a></h3>", ); write_sidebar_links(out, concrete_format); } if !synthetic_format.is_empty() { out.push_str( - "<a class=\"sidebar-title\" href=\"#synthetic-implementations\">\ - Auto Trait Implementations</a>", + "<h3 class=\"sidebar-title\"><a href=\"#synthetic-implementations\">\ + Auto Trait Implementations</a></h3>", ); write_sidebar_links(out, synthetic_format); } if !blanket_format.is_empty() { out.push_str( - "<a class=\"sidebar-title\" href=\"#blanket-implementations\">\ - Blanket Implementations</a>", + "<h3 class=\"sidebar-title\"><a href=\"#blanket-implementations\">\ + Blanket Implementations</a></h3>", ); write_sidebar_links(out, blanket_format); } @@ -2010,7 +2009,7 @@ fn sidebar_deref_methods(cx: &Context<'_>, out: &mut Buffer, impl_: &Impl, v: &V if !ret.is_empty() { write!( out, - "<a class=\"sidebar-title\" href=\"#deref-methods\">Methods from {}<Target={}></a>", + "<h3 class=\"sidebar-title\"><a href=\"#deref-methods\">Methods from {}<Target={}></a></h3>", Escape(&format!("{:#}", impl_.inner_impl().trait_.as_ref().unwrap().print(cx))), Escape(&format!("{:#}", real_target.print(cx))), ); @@ -2046,7 +2045,7 @@ fn sidebar_struct(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, s: &clea if !fields.is_empty() { if let CtorKind::Fictive = s.struct_type { sidebar.push_str( - "<a class=\"sidebar-title\" href=\"#fields\">Fields</a>\ + "<h3 class=\"sidebar-title\"><a href=\"#fields\">Fields</a></h3>\ <div class=\"sidebar-links\">", ); @@ -2123,8 +2122,8 @@ fn sidebar_trait(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, t: &clean print_sidebar_section( buf, &t.items, - "<a class=\"sidebar-title\" href=\"#associated-types\">\ - Associated Types</a><div class=\"sidebar-links\">", + "<h3 class=\"sidebar-title\"><a href=\"#associated-types\">\ + Associated Types</a></h3><div class=\"sidebar-links\">", |m| m.is_associated_type(), |out, sym| write!(out, "<a href=\"#associatedtype.{0}\">{0}</a>", sym), "</div>", @@ -2133,8 +2132,8 @@ fn sidebar_trait(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, t: &clean print_sidebar_section( buf, &t.items, - "<a class=\"sidebar-title\" href=\"#associated-const\">\ - Associated Constants</a><div class=\"sidebar-links\">", + "<h3 class=\"sidebar-title\"><a href=\"#associated-const\">\ + Associated Constants</a></h3><div class=\"sidebar-links\">", |m| m.is_associated_const(), |out, sym| write!(out, "<a href=\"#associatedconstant.{0}\">{0}</a>", sym), "</div>", @@ -2143,8 +2142,8 @@ fn sidebar_trait(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, t: &clean print_sidebar_section( buf, &t.items, - "<a class=\"sidebar-title\" href=\"#required-methods\">\ - Required Methods</a><div class=\"sidebar-links\">", + "<h3 class=\"sidebar-title\"><a href=\"#required-methods\">\ + Required Methods</a></h3><div class=\"sidebar-links\">", |m| m.is_ty_method(), |out, sym| write!(out, "<a href=\"#tymethod.{0}\">{0}</a>", sym), "</div>", @@ -2153,8 +2152,8 @@ fn sidebar_trait(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, t: &clean print_sidebar_section( buf, &t.items, - "<a class=\"sidebar-title\" href=\"#provided-methods\">\ - Provided Methods</a><div class=\"sidebar-links\">", + "<h3 class=\"sidebar-title\"><a href=\"#provided-methods\">\ + Provided Methods</a></h3><div class=\"sidebar-links\">", |m| m.is_method(), |out, sym| write!(out, "<a href=\"#method.{0}\">{0}</a>", sym), "</div>", @@ -2176,8 +2175,8 @@ fn sidebar_trait(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, t: &clean if !res.is_empty() { res.sort(); buf.push_str( - "<a class=\"sidebar-title\" href=\"#foreign-impls\">\ - Implementations on Foreign Types</a>\ + "<h3 class=\"sidebar-title\"><a href=\"#foreign-impls\">\ + Implementations on Foreign Types</a></h3>\ <div class=\"sidebar-links\">", ); for (name, id) in res.into_iter() { @@ -2189,11 +2188,11 @@ fn sidebar_trait(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, t: &clean sidebar_assoc_items(cx, buf, it); - buf.push_str("<a class=\"sidebar-title\" href=\"#implementors\">Implementors</a>"); + buf.push_str("<h3 class=\"sidebar-title\"><a href=\"#implementors\">Implementors</a></h3>"); if t.is_auto { buf.push_str( - "<a class=\"sidebar-title\" \ - href=\"#synthetic-implementors\">Auto Implementors</a>", + "<h3 class=\"sidebar-title\"><a \ + href=\"#synthetic-implementors\">Auto Implementors</a></h3>", ); } @@ -2236,7 +2235,7 @@ fn sidebar_union(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, u: &clean if !fields.is_empty() { sidebar.push_str( - "<a class=\"sidebar-title\" href=\"#fields\">Fields</a>\ + "<h3 class=\"sidebar-title\"><a href=\"#fields\">Fields</a></h3>\ <div class=\"sidebar-links\">", ); @@ -2268,7 +2267,7 @@ fn sidebar_enum(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, e: &clean: if !variants.is_empty() { variants.sort_unstable(); sidebar.push_str(&format!( - "<a class=\"sidebar-title\" href=\"#variants\">Variants</a>\ + "<h3 class=\"sidebar-title\"><a href=\"#variants\">Variants</a></h3>\ <div class=\"sidebar-links\">{}</div>", variants.join(""), )); |