From a5dd8d9724aae7bf5b651b73dce9f5d8b32f5adc Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sat, 26 Jun 2021 21:14:42 +0200 Subject: [PATCH 1/3] Fix font weight on types, methods and associated types/consts --- src/librustdoc/html/static/rustdoc.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 3b52fd94d27..a4e3f13b861 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -146,9 +146,15 @@ h1.fqn > .in-band > a:hover { h2, h3, h4 { border-bottom: 1px solid; } -.impl, .impl-items .method, -.impl-items .type, .impl-items .associatedconstant, -.impl-items .associatedtype { +.impl, +.impl-items .method, +.methods .method, +.impl-items .type, +.methods .type, +.impl-items .associatedconstant, +.methods .associatedconstant, +.impl-items .associatedtype, +.methods .associatedtype { flex-basis: 100%; font-weight: 600; margin-top: 16px; From 7a5837c81009293f9466a6426fa203ae13d985e8 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sat, 26 Jun 2021 21:38:04 +0200 Subject: [PATCH 2/3] Remove erroneously created file --- src/test/rustdoc-gui/type-weight.rs | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 src/test/rustdoc-gui/type-weight.rs diff --git a/src/test/rustdoc-gui/type-weight.rs b/src/test/rustdoc-gui/type-weight.rs deleted file mode 100644 index 8b6518e7f31..00000000000 --- a/src/test/rustdoc-gui/type-weight.rs +++ /dev/null @@ -1,2 +0,0 @@ -goto: file://|DOC_PATH|/test_docs/type.SomeType.html -assert-all: (".top-block .docblock p", {"font-weight": "400"}) From 2fd1229a1aad7d3335de588b29396886b92cdb48 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sat, 26 Jun 2021 21:38:24 +0200 Subject: [PATCH 3/3] Add tests to ensure the font-weight is the correct one --- src/test/rustdoc-gui/font-weight.goml | 13 +++++++++++++ src/test/rustdoc-gui/src/lib2.rs | 2 ++ 2 files changed, 15 insertions(+) diff --git a/src/test/rustdoc-gui/font-weight.goml b/src/test/rustdoc-gui/font-weight.goml index 80618112103..84e898660fa 100644 --- a/src/test/rustdoc-gui/font-weight.goml +++ b/src/test/rustdoc-gui/font-weight.goml @@ -5,3 +5,16 @@ assert-css: ("//*[@class='structfield small-section-header']//a[text()='Alias']" assert-css: ("#method\.a_method > code", {"font-weight": "600"}) assert-css: ("#associatedtype\.X > code", {"font-weight": "600"}) assert-css: ("#associatedconstant\.Y > code", {"font-weight": "600"}) + +goto: file://|DOC_PATH|/test_docs/type.SomeType.html +assert-css: (".top-doc .docblock p", {"font-weight": "400"}, ALL) + +goto: file://|DOC_PATH|/test_docs/struct.Foo.html +assert-css: (".impl-items .method", {"font-weight": "600"}, ALL) + +goto: file://|DOC_PATH|/lib2/trait.Trait.html +assert-count: (".methods .type", 1) +assert-css: (".methods .type", {"font-weight": "600"}) +assert-count: (".methods .constant", 1) +assert-css: (".methods .constant", {"font-weight": "600"}) +assert-css: (".methods .method", {"font-weight": "600"}) diff --git a/src/test/rustdoc-gui/src/lib2.rs b/src/test/rustdoc-gui/src/lib2.rs index 6fa1b36b29b..77d384f3113 100644 --- a/src/test/rustdoc-gui/src/lib2.rs +++ b/src/test/rustdoc-gui/src/lib2.rs @@ -23,6 +23,8 @@ impl Foo { pub trait Trait { type X; const Y: u32; + + fn foo() {} } impl Trait for Foo {