From 081336e8eb5d94071dad7f6fee9efd00305dc381 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 19 Feb 2017 00:31:09 +0100 Subject: [PATCH] Improve associated constant rendering in rustdoc --- src/librustdoc/html/render.rs | 2 +- src/librustdoc/html/static/main.js | 2 +- src/librustdoc/html/static/rustdoc.css | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index ae4c94d4b38..86b7c9736da 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -2217,7 +2217,7 @@ fn assoc_const(w: &mut fmt::Formatter, ty: &clean::Type, default: Option<&String>, link: AssocItemLink) -> fmt::Result { - write!(w, "const {}", + write!(w, "const {}", naive_assoc_href(it, link), it.name.as_ref().unwrap())?; diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js index c12e1e7d608..20028586227 100644 --- a/src/librustdoc/html/static/main.js +++ b/src/librustdoc/html/static/main.js @@ -979,7 +979,7 @@ .html("[]"); toggle.children(".inner").text(labelForToggleButton(false)); - $(".method").each(function() { + $(".method, .impl-items > .associatedconstant").each(function() { if ($(this).next().is(".docblock") || ($(this).next().is(".stability") && $(this).next().next().is(".docblock"))) { $(this).children().last().after(toggle.clone()); diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 681d2354056..b0bf69b0181 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -89,7 +89,7 @@ h2 { h3 { font-size: 1.3em; } -h1, h2, h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.type):not(.tymethod) { +h1, h2, h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.type):not(.tymethod):not(.associatedconstant) { font-weight: 500; margin: 20px 0 15px 0; padding-bottom: 6px; @@ -99,10 +99,10 @@ h1.fqn { margin-top: 0; position: relative; } -h2, h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.type):not(.tymethod) { +h2, h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.type):not(.tymethod):not(.associatedconstant) { border-bottom: 1px solid; } -h3.impl, h3.method, h4.method, h3.type, h4.type { +h3.impl, h3.method, h4.method, h3.type, h4.type, h4.associatedconstant { font-weight: 600; margin-top: 10px; margin-bottom: 10px; @@ -382,7 +382,7 @@ h4 > code, h3 > code, .invisible > code { .content .impl-items .docblock, .content .impl-items .stability { margin-left: 40px; } -.content .impl-items .method, .content .impl-items > .type { +.content .impl-items .method, .content .impl-items > .type, .impl-items > .associatedconstant { margin-left: 20px; }