From 87e39ac1ec0df8c45a4441cf6bb905d7fd282354 Mon Sep 17 00:00:00 2001 From: Noah Lev Date: Mon, 23 Aug 2021 10:49:56 -0700 Subject: [PATCH] Remove bolding on associated constants Associated types don't get bolded, so it looks off to have one kind bolded and one not. --- src/librustdoc/html/render/mod.rs | 2 +- src/test/rustdoc-gui/font-weight.goml | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 7704abc9a72c..620b4cdf9da4 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -753,7 +753,7 @@ fn assoc_const( ) { write!( w, - "{}{}const {}: {}", + "{}{}const {}: {}", extra, it.visibility.print_with_space(it.def_id, cx), naive_assoc_href(it, link, cx), diff --git a/src/test/rustdoc-gui/font-weight.goml b/src/test/rustdoc-gui/font-weight.goml index 92ad92a8c341..d8411511c5ae 100644 --- a/src/test/rustdoc-gui/font-weight.goml +++ b/src/test/rustdoc-gui/font-weight.goml @@ -13,6 +13,21 @@ 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 + +// This is a complex selector, so here's how it works: +// +// * //*[@class='docblock type-decl'] — selects element of any tag with classes docblock and type-decl +// * /pre[@class='rust trait'] — selects immediate child with tag pre and classes rust and trait +// * /code — selects immediate child with tag code +// * /a[@class='constant'] — selects immediate child with tag a and class constant +// * //text() — selects child that is text node +// * /parent::* — selects immediate parent of the text node (the * means it can be any tag) +// +// This uses '/parent::*' as a proxy for the style of the text node. +// We can't just select the '' because intermediate tags could be added. +assert-count: ("//*[@class='docblock type-decl']/pre[@class='rust trait']/code/a[@class='constant']//text()/parent::*", 1) +assert-css: ("//*[@class='docblock type-decl']/pre[@class='rust trait']/code/a[@class='constant']//text()/parent::*", {"font-weight": "400"}) + assert-count: (".methods .type", 1) assert-css: (".methods .type", {"font-weight": "600"}) assert-count: (".methods .constant", 1)