Skip to content

Commit d5ec5aa

Browse files
authored
Rollup merge of #88089 - dns2utf8:rustdoc_font_test, r=GuillaumeGomez
Rustdoc font test Add a font test based on #85669 fixes #85632. r? `@jsha` `@GuillaumeGomez`
2 parents 4de53c4 + 2f486d5 commit d5ec5aa

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

src/test/rustdoc-gui/module-items-font.goml

+19
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,22 @@
22
goto: file://|DOC_PATH|/test_docs/index.html
33
assert-css: (".item-table .module-item a", {"font-family": '"Fira Sans", Arial, sans-serif'}, ALL)
44
assert-css: (".item-table .docblock-short", {"font-family": '"Source Serif 4", "Noto Sans KR", serif'}, ALL)
5+
6+
// modules
7+
assert-css: ("#modules + .item-table .item-left a", {"font-family": '"Fira Sans", Arial, sans-serif'})
8+
assert-css: ("#modules + .item-table .item-right.docblock-short", {"font-family": '"Source Serif 4", "Noto Sans KR", serif'})
9+
// structs
10+
assert-css: ("#structs + .item-table .item-left a", {"font-family": '"Fira Sans", Arial, sans-serif'})
11+
assert-css: ("#structs + .item-table .item-right.docblock-short", {"font-family": '"Source Serif 4", "Noto Sans KR", serif'})
12+
// enums
13+
assert-css: ("#enums + .item-table .item-left a", {"font-family": '"Fira Sans", Arial, sans-serif'})
14+
assert-css: ("#enums + .item-table .item-right.docblock-short", {"font-family": '"Source Serif 4", "Noto Sans KR", serif'})
15+
// traits
16+
assert-css: ("#traits + .item-table .item-left a", {"font-family": '"Fira Sans", Arial, sans-serif'})
17+
assert-css: ("#traits + .item-table .item-right.docblock-short", {"font-family": '"Source Serif 4", "Noto Sans KR", serif'})
18+
// functions
19+
assert-css: ("#functions + .item-table .item-left a", {"font-family": '"Fira Sans", Arial, sans-serif'})
20+
assert-css: ("#functions + .item-table .item-right.docblock-short", {"font-family": '"Source Serif 4", "Noto Sans KR", serif'})
21+
// keywords
22+
assert-css: ("#keywords + .item-table .item-left a", {"font-family": '"Fira Sans", Arial, sans-serif'})
23+
assert-css: ("#keywords + .item-table .item-right.docblock-short", {"font-family": '"Source Serif 4", "Noto Sans KR", serif'})

src/tools/rustdoc-gui/tester.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,13 @@ function char_printer(n_tests) {
9393
}
9494
},
9595
finish: function() {
96-
const spaces = " ".repeat(max_per_line - (current % max_per_line));
97-
process.stdout.write(`${spaces} (${current}/${n_tests})${os.EOL}${os.EOL}`);
96+
if (current % max_per_line === 0) {
97+
// Don't output if we are already at a matching line end
98+
console.log("");
99+
} else {
100+
const spaces = " ".repeat(max_per_line - (current % max_per_line));
101+
process.stdout.write(`${spaces} (${current}/${n_tests})${os.EOL}${os.EOL}`);
102+
}
98103
},
99104
};
100105
}

0 commit comments

Comments
 (0)