mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #132258 - GuillaumeGomez:variant-structfields-margins, r=notriddle

Browse Source 
[rustdoc] Unify variant struct fields margins with struct fields

As discussed in https://github.com/rust-lang/rust/pull/132220.

| before | after |
|-|-|
| ![image](https://github.com/user-attachments/assets/d8d8336d-7fe4-45fb-a5a5-36a4023223f5) | ![Screenshot from 2024-10-28 11-17-24](https://github.com/user-attachments/assets/9d0d9633-b857-45b4-9217-7d0d1aa8f770) |

r? ```@notriddle```
This commit is contained in:
Jubilee 2024-10-28 10:18:51 -07:00 committed by GitHub
commit 6ea83ffe2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustdoc/html/static/css/rustdoc.css
View File

@ -230,7 +230,7 @@ h4.code-header {
padding: 0;
white-space: pre-wrap;
}
.structfield {
.structfield, .sub-variant-field {
margin: 0.6em 0;
}

13
tests/rustdoc-gui/fields.goml
View File

@ -1,6 +1,7 @@
// This test checks that fields are displayed as expected (one by line) and they are surrounded
// by margins.
store-value: (margin, "9.6px")
define-function: (
"check-fields",
[path, selector_1, selector_2],
@ -12,8 +13,8 @@ define-function: (
// Check the margins.
assert-css: (".structfield.section-header", {
"margin-top": "9.6px",
"margin-bottom": "9.6px",
"margin-top": |margin|,
"margin-bottom": |margin|,
"margin-left": "0px",
"margin-right": "0px",
}, ALL)
@ -41,9 +42,9 @@ store-position: ("#variant\.B\.field\.b", {"y": b_y})
assert: |a_y| < |b_y|
// Check the margins.
assert-css: (".sub-variant-field .section-header", {
"margin-top": "0px",
"margin-bottom": "0px",
"margin-left": "0px",
assert-css: (".sub-variant-field", {
"margin-top": |margin|,
"margin-bottom": |margin|,
"margin-left": "24px",
"margin-right": "0px",
}, ALL)