Skip to content

Commit 168e3da

Browse files
notriddlenotriddle
committed
rustdoc: prevent CSS layout of line numbers shrinking into nothing
1 parent 8a746f4 commit 168e3da

File tree

9 files changed

+108
-2
lines changed

9 files changed

+108
-2
lines changed

‎src/librustdoc/html/static/css/rustdoc.css

+1
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ ul.block, .block li {
543543
.rustdoc .example-wrap > pre.example-line-numbers,
544544
.rustdoc .example-wrap > pre.src-line-numbers {
545545
flex-grow: 0;
546+
min-width: fit-content; /* prevent collapsing into nothing in truncated scraped examples */
546547
overflow: initial;
547548
text-align: right;
548549
-webkit-user-select: none;

‎src/test/rustdoc-gui/scrape-examples-layout.goml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Check that the line number column has the correct layout.
2+
goto: "file://" + |DOC_PATH| + "/scrape_examples/fn.test_many.html"
3+
4+
// Check that it's not zero.
5+
assert-property-false: (
6+
".more-scraped-examples .scraped-example .code-wrapper .src-line-numbers",
7+
{"clientWidth": "0"}
8+
)
9+
10+
// Check that examples with very long lines have the same width as ones that don't.
11+
store-property: (
12+
clientWidth,
13+
".more-scraped-examples .scraped-example:nth-child(1) .code-wrapper .src-line-numbers",
14+
"clientWidth"
15+
)
16+
17+
assert-property: (
18+
".more-scraped-examples .scraped-example:nth-child(2) .code-wrapper .src-line-numbers",
19+
{"clientWidth": |clientWidth|}
20+
)
21+
22+
assert-property: (
23+
".more-scraped-examples .scraped-example:nth-child(3) .code-wrapper .src-line-numbers",
24+
{"clientWidth": |clientWidth|}
25+
)
26+
27+
assert-property: (
28+
".more-scraped-examples .scraped-example:nth-child(4) .code-wrapper .src-line-numbers",
29+
{"clientWidth": |clientWidth|}
30+
)
31+
32+
assert-property: (
33+
".more-scraped-examples .scraped-example:nth-child(5) .code-wrapper .src-line-numbers",
34+
{"clientWidth": |clientWidth|}
35+
)

‎src/test/rustdoc-gui/src/scrape_examples/examples/check-many-1.rs

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
fn main() {
2+
// all examples have same line count
3+
scrape_examples::test_many();
4+
scrape_examples::test_many();
5+
scrape_examples::test_many();
6+
scrape_examples::test_many();
7+
scrape_examples::test_many();
8+
scrape_examples::test_many();
9+
scrape_examples::test_many();
10+
scrape_examples::test_many();
11+
scrape_examples::test_many();
212
scrape_examples::test_many();
313
}

‎src/test/rustdoc-gui/src/scrape_examples/examples/check-many-2.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
fn main() {
2-
scrape_examples::test_many();
2+
// ignore-tidy-linelength
3+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
4+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
5+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
6+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
7+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
8+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
9+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
10+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
11+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
12+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
313
}

‎src/test/rustdoc-gui/src/scrape_examples/examples/check-many-3.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
fn main() {
2-
scrape_examples::test_many();
2+
// ignore-tidy-linelength
3+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
4+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
5+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
6+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
7+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
8+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
9+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
10+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
11+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
12+
scrape_examples::test_many(); /* Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. */
313
}

‎src/test/rustdoc-gui/src/scrape_examples/examples/check-many-4.rs

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
fn main() {
2+
// all examples have same line count
3+
scrape_examples::test_many();
4+
scrape_examples::test_many();
5+
scrape_examples::test_many();
6+
scrape_examples::test_many();
7+
scrape_examples::test_many();
8+
scrape_examples::test_many();
9+
scrape_examples::test_many();
10+
scrape_examples::test_many();
11+
scrape_examples::test_many();
212
scrape_examples::test_many();
313
}

‎src/test/rustdoc-gui/src/scrape_examples/examples/check-many-5.rs

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
fn main() {
2+
// all examples have same line count
3+
scrape_examples::test_many();
4+
scrape_examples::test_many();
5+
scrape_examples::test_many();
6+
scrape_examples::test_many();
7+
scrape_examples::test_many();
8+
scrape_examples::test_many();
9+
scrape_examples::test_many();
10+
scrape_examples::test_many();
11+
scrape_examples::test_many();
212
scrape_examples::test_many();
313
}

‎src/test/rustdoc-gui/src/scrape_examples/examples/check-many-6.rs

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
fn main() {
2+
// all examples have same line count
3+
scrape_examples::test_many();
4+
scrape_examples::test_many();
5+
scrape_examples::test_many();
6+
scrape_examples::test_many();
7+
scrape_examples::test_many();
8+
scrape_examples::test_many();
9+
scrape_examples::test_many();
10+
scrape_examples::test_many();
11+
scrape_examples::test_many();
212
scrape_examples::test_many();
313
}

‎src/test/rustdoc-gui/src/scrape_examples/examples/check-many-7.rs

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
fn main() {
2+
// all examples have same line count
3+
scrape_examples::test_many();
4+
scrape_examples::test_many();
5+
scrape_examples::test_many();
6+
scrape_examples::test_many();
7+
scrape_examples::test_many();
8+
scrape_examples::test_many();
9+
scrape_examples::test_many();
10+
scrape_examples::test_many();
11+
scrape_examples::test_many();
212
scrape_examples::test_many();
313
}

0 commit comments

Comments
 (0)