nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #113285 - GuillaumeGomez:display-long-inline-cfg, r=notriddle

Browse Source 
[rustdoc] Fix display of long inline cfg labels

Fixes #87957.
Fixes #112880.

Before:

![Screenshot from 2023-07-03 13-25-47](https://github.com/rust-lang/rust/assets/3050060/401e2c6b-2cfd-4ae3-9d15-b5e1dfec4201)

After:

![Screenshot from 2023-07-03 13-24-49](https://github.com/rust-lang/rust/assets/3050060/e42a34a8-bf60-409d-8a0c-1669d09e7e1e)

r? `@notriddle`
This commit is contained in:
Guillaume Gomez 2023-07-03 18:46:14 +02:00 committed by GitHub
commit ef21fd57c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -971,6 +971,8 @@ so that we can apply CSS-filters to change the arrow color in themes */
display: flex; display: flex;
padding: 3px; padding: 3px;
margin-bottom: 5px; margin-bottom: 5px;
align-items: center;
vertical-align: text-bottom;
} }
.item-name .stab { .item-name .stab {
margin-left: 0.3125em; margin-left: 0.3125em;
@ -982,11 +984,9 @@ so that we can apply CSS-filters to change the arrow color in themes */
color: var(--main-color); color: var(--main-color);
background-color: var(--stab-background-color); background-color: var(--stab-background-color);
width: fit-content; width: fit-content;
align-items: center;
white-space: pre-wrap; white-space: pre-wrap;
border-radius: 3px; border-radius: 3px;
display: inline-flex; display: inline;
vertical-align: text-bottom;
} }
.stab.portability > code { .stab.portability > code {

12
tests/rustdoc-gui/label-next-to-symbol.goml
View File

@ -37,7 +37,6 @@ compare-elements-position: (
("y"), ("y"),
) )
// Mobile view // Mobile view
set-window-size: (600, 600) set-window-size: (600, 600)
// staggered layout with 2em spacing // staggered layout with 2em spacing
@ -64,3 +63,14 @@ compare-elements-position-false: (
"//*[@class='desc docblock-short'][text()='a thing with a label']", "//*[@class='desc docblock-short'][text()='a thing with a label']",
("y"), ("y"),
) )
// Ensure it doesn't expand.
set-window-size: (800, 800)
go-to: "file://" + |DOC_PATH| + "/test_docs/cfgs/index.html"
// This part of the tags should not be on the same line as the beginning since the width
// is too small for that.
compare-elements-position-false: (
"//*[@class='stab portability']/code[text()='appservice-api-c']",
"//*[@class='stab portability']/code[text()='server']",
("y"),
)

9
tests/rustdoc-gui/src/test_docs/lib.rs
View File

@ -507,3 +507,12 @@ pub mod fields {
}, },
} }
} }
pub mod cfgs {
#[doc(cfg(all(
any(not(feature = "appservice-api-c"), not(feature = "appservice-api-s")),
any(not(feature = "client"), not(feature = "server")),
)))]
/// Some docs.
pub mod cfgs {}
}