squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #85631 - GuillaumeGomez:move-keywrod-primitive-css-dom, r=jsha

Browse source 
Move keyword primitive css dom

Fixes #85569.

r? ``@jsha``
This commit is contained in:
Guillaume Gomez 2021-05-25 13:05:14 +02:00 committed by GitHub
commit 0f3c98ad51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/librustdoc/html/static/rustdoc.css
View file

@ -796,16 +796,6 @@ a {
display: inline-block;
}
.result-name span.primitive::after {
content: ' (primitive type)';
font-style: italic;
}
.result-name span.keyword::after {
content: ' (keyword)';
font-style: italic;
}
body.blur > :not(#help) {
filter: blur(8px);
-webkit-filter: blur(8px);

18
src/librustdoc/html/static/search.js
View file

@ -975,26 +975,32 @@ window.initSearch = function(rawSearchIndex) {
output = "<div class=\"search-results " + extraClass + "\">";
array.forEach(function(item) {
var name, type;
name = item.name;
type = itemTypes[item.ty];
if (item.is_alias !== true) {
if (duplicates[item.fullPath]) {
return;
}
duplicates[item.fullPath] = true;
}
var name = item.name;
var type = itemTypes[item.ty];
length += 1;
var extra = "";
if (type === "primitive") {
extra = " <i>(primitive type)</i>";
} else if (type === "keyword") {
extra = " <i>(keyword)</i>";
}
output += "<a class=\"result-" + type + "\" href=\"" + item.href + "\">" +
"<div><div class=\"result-name\">" +
(item.is_alias === true ?
("<span class=\"alias\"><b>" + item.alias + " </b></span><span " +
"class=\"grey\"><i>&nbsp;- see&nbsp;</i></span>") : "") +
item.displayPath + "<span class=\"" + type + "\">" +
name + "</span></div><div class=\"desc\">" +
name + extra + "</span></div><div class=\"desc\">" +
"<span>" + item.desc +
"&nbsp;</span></div></div></a>";
});

7
src/test/rustdoc-gui/search-result-keyword.goml
View file

@ -5,7 +5,6 @@ wait-for: "#titles"
// Note: The two next assert commands could be merged as one but readability would be
// less good.
//
// Checking that the CSS is displaying " (keyword)"...
assert: (".result-name span.keyword::after", {"content": '" (keyword)"'})
// ... in italic.
assert: (".result-name span.keyword::after", {"font-style": "italic"})
// Checking that the CSS is displaying " (keyword)" in italic.
assert: (".result-name span.keyword > i", "(keyword)")
assert: (".result-name span.keyword", "CookieMonster (keyword)")