bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustdoc: remove unused classes from sidebar

Browse source 
Since 98f05a0282 removed separate colors
from the currently-selected item, there's no need to have item classes on
sidebar links.
This commit is contained in:
Michael Howell 2022-10-11 08:50:41 -07:00
parent bb93450ec4
commit b5963f07e6
3 changed files with 67 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustdoc/html/static/js/main.js
View file

@ -451,7 +451,6 @@ function loadCss(cssFileName) {
const name = item[0]; const name = item[0];
const desc = item[1]; // can be null const desc = item[1]; // can be null
let klass = shortty;
let path; let path;
if (shortty === "mod") { if (shortty === "mod") {
path = name + "/index.html"; path = name + "/index.html";
@ -459,13 +458,12 @@ function loadCss(cssFileName) {
path = shortty + "." + name + ".html"; path = shortty + "." + name + ".html";
} }
const current_page = document.location.href.split("/").pop(); const current_page = document.location.href.split("/").pop();
if (path === current_page) {
klass += " current";
}
const link = document.createElement("a"); const link = document.createElement("a");
link.href = path; link.href = path;
link.title = desc; link.title = desc;
link.className = klass; if (path === current_page) {
link.className = "current";
}
link.textContent = name; link.textContent = name;
const li = document.createElement("li"); const li = document.createElement("li");
li.appendChild(link); li.appendChild(link);

126
src/test/rustdoc-gui/sidebar-links-color.goml
View file

@ -13,72 +13,72 @@ reload:
// Struct // Struct
assert-css: ( assert-css: (
".sidebar a.struct:not(.current)", ".sidebar .block.struct a:not(.current)",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.struct:not(.current)" move-cursor-to: ".sidebar .block.struct a:not(.current)"
assert-css: ( assert-css: (
".sidebar a.struct:hover", ".sidebar .block.struct a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
) )
// Enum // Enum
assert-css: ( assert-css: (
".sidebar a.enum", ".sidebar .block.enum a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.enum" move-cursor-to: ".sidebar .block.enum a"
assert-css: ( assert-css: (
".sidebar a.enum:hover", ".sidebar .block.enum a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
) )
// Union // Union
assert-css: ( assert-css: (
".sidebar a.union", ".sidebar .block.union a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.union" move-cursor-to: ".sidebar .block.union a"
assert-css: ( assert-css: (
".sidebar a.union:hover", ".sidebar .block.union a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
) )
// Trait // Trait
assert-css: ( assert-css: (
".sidebar a.trait", ".sidebar .block.trait a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.trait" move-cursor-to: ".sidebar .block.trait a"
assert-css: ( assert-css: (
".sidebar a.trait:hover", ".sidebar .block.trait a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
) )
// Function // Function
assert-css: ( assert-css: (
".sidebar a.fn", ".sidebar .block.fn a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.fn" move-cursor-to: ".sidebar .block.fn a"
assert-css: ( assert-css: (
".sidebar a.fn:hover", ".sidebar .block.fn a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
) )
// Type definition // Type definition
assert-css: ( assert-css: (
".sidebar a.type", ".sidebar .block.type a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.type" move-cursor-to: ".sidebar .block.type a"
assert-css: ( assert-css: (
".sidebar a.type:hover", ".sidebar .block.type a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
) )
// Keyword // Keyword
assert-css: ( assert-css: (
".sidebar a.keyword", ".sidebar .block.keyword a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.keyword" move-cursor-to: ".sidebar .block.keyword a"
assert-css: ( assert-css: (
".sidebar a.keyword:hover", ".sidebar .block.keyword a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
) )
@ -88,72 +88,72 @@ reload:
// Struct // Struct
assert-css: ( assert-css: (
".sidebar a.struct:not(.current)", ".sidebar .block.struct a:not(.current)",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.struct:not(.current)" move-cursor-to: ".sidebar .block.struct a:not(.current)"
assert-css: ( assert-css: (
".sidebar a.struct:hover", ".sidebar .block.struct a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
) )
// Enum // Enum
assert-css: ( assert-css: (
".sidebar a.enum", ".sidebar .block.enum a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.enum" move-cursor-to: ".sidebar .block.enum a"
assert-css: ( assert-css: (
".sidebar a.enum:hover", ".sidebar .block.enum a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
) )
// Union // Union
assert-css: ( assert-css: (
".sidebar a.union", ".sidebar .block.union a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.union" move-cursor-to: ".sidebar .block.union a"
assert-css: ( assert-css: (
".sidebar a.union:hover", ".sidebar .block.union a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
) )
// Trait // Trait
assert-css: ( assert-css: (
".sidebar a.trait", ".sidebar .block.trait a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.trait" move-cursor-to: ".sidebar .block.trait a"
assert-css: ( assert-css: (
".sidebar a.trait:hover", ".sidebar .block.trait a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
) )
// Function // Function
assert-css: ( assert-css: (
".sidebar a.fn", ".sidebar .block.fn a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.fn" move-cursor-to: ".sidebar .block.fn a"
assert-css: ( assert-css: (
".sidebar a.fn:hover", ".sidebar .block.fn a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
) )
// Type definition // Type definition
assert-css: ( assert-css: (
".sidebar a.type", ".sidebar .block.type a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.type" move-cursor-to: ".sidebar .block.type a"
assert-css: ( assert-css: (
".sidebar a.type:hover", ".sidebar .block.type a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
) )
// Keyword // Keyword
assert-css: ( assert-css: (
".sidebar a.keyword", ".sidebar .block.keyword a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.keyword" move-cursor-to: ".sidebar .block.keyword a"
assert-css: ( assert-css: (
".sidebar a.keyword:hover", ".sidebar .block.keyword a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"}, {"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
) )
@ -163,71 +163,71 @@ reload:
// Struct // Struct
assert-css: ( assert-css: (
".sidebar a.struct:not(.current)", ".sidebar .block.struct a:not(.current)",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.struct:not(.current)" move-cursor-to: ".sidebar .block.struct a:not(.current)"
assert-css: ( assert-css: (
".sidebar a.struct:hover", ".sidebar .block.struct a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
) )
// Enum // Enum
assert-css: ( assert-css: (
".sidebar a.enum", ".sidebar .block.enum a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.enum" move-cursor-to: ".sidebar .block.enum a"
assert-css: ( assert-css: (
".sidebar a.enum:hover", ".sidebar .block.enum a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
) )
// Union // Union
assert-css: ( assert-css: (
".sidebar a.union", ".sidebar .block.union a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.union" move-cursor-to: ".sidebar .block.union a"
assert-css: ( assert-css: (
".sidebar a.union:hover", ".sidebar .block.union a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
) )
// Trait // Trait
assert-css: ( assert-css: (
".sidebar a.trait", ".sidebar .block.trait a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.trait" move-cursor-to: ".sidebar .block.trait a"
assert-css: ( assert-css: (
".sidebar a.trait:hover", ".sidebar .block.trait a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
) )
// Function // Function
assert-css: ( assert-css: (
".sidebar a.fn", ".sidebar .block.fn a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.fn" move-cursor-to: ".sidebar .block.fn a"
assert-css: ( assert-css: (
".sidebar a.fn:hover", ".sidebar .block.fn a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
) )
// Type definition // Type definition
assert-css: ( assert-css: (
".sidebar a.type", ".sidebar .block.type a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.type" move-cursor-to: ".sidebar .block.type a"
assert-css: ( assert-css: (
".sidebar a.type:hover", ".sidebar .block.type a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
) )
// Keyword // Keyword
assert-css: ( assert-css: (
".sidebar a.keyword", ".sidebar .block.keyword a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
) )
move-cursor-to: ".sidebar a.keyword" move-cursor-to: ".sidebar .block.keyword a"
assert-css: ( assert-css: (
".sidebar a.keyword:hover", ".sidebar .block.keyword a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"}, {"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
) )

2
src/test/rustdoc-gui/sidebar-macro-reexport.goml
View file

@ -1,5 +1,5 @@
// This test ensures that the reexport of a macro doesn't make the original macro // This test ensures that the reexport of a macro doesn't make the original macro
// displayed twice in the sidebar. // displayed twice in the sidebar.
goto: "file://" + |DOC_PATH| + "/test_docs/macro.repro.html" goto: "file://" + |DOC_PATH| + "/test_docs/macro.repro.html"
wait-for: ".sidebar-elems .macro .macro" wait-for: ".sidebar-elems .block.macro a"
assert-count: ("//*[@class='sidebar-elems']//*[@class='block macro']//a[text()='repro']", 1) assert-count: ("//*[@class='sidebar-elems']//*[@class='block macro']//a[text()='repro']", 1)