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

Rollup merge of #87162 - GuillaumeGomez:type-decl-overflow, r=notriddle

Browse Source 
Fix type decl layout "overflow"

Before:

![Screenshot from 2021-07-15 17-56-12](https://user-images.githubusercontent.com/3050060/125822644-c4595211-d75e-4dd7-ba44-183197ee836c.png)

After:

![Screenshot from 2021-07-15 17-56-17](https://user-images.githubusercontent.com/3050060/125822648-7b363847-e153-4ff3-9fba-59478e32eced.png)

cc ```@SergioBenitez```

r? ```@notriddle```
This commit is contained in:
Guillaume Gomez 2021-07-16 10:08:09 +02:00 committed by GitHub
commit a547abe929
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,6 +247,9 @@ code, pre, a.test-arrow {
pre {
padding: 14px;
}
.type-decl pre {
overflow-x: auto;
}
.source .content pre {
padding: 20px;

7
src/test/rustdoc-gui/src/lib2/lib.rs
View File

@ -47,3 +47,10 @@ pub mod sub_mod {
/// ```
pub struct Foo;
}
pub mod long_trait {
use std::ops::DerefMut;
pub trait ALongNameBecauseItHelpsTestingTheCurrentProblem: DerefMut<Target = u32>
+ From<u128> + Send + Sync + AsRef<str> + 'static {}
}

8
src/test/rustdoc-gui/type-declation-overflow.goml Normal file
View File

@ -0,0 +1,8 @@
// This test ensures that the type declaration content overflow is handled inside the <pre> directly.
goto: file://|DOC_PATH|/lib2/long_trait/trait.ALongNameBecauseItHelpsTestingTheCurrentProblem.html
// We set a fixed size so there is no chance of "random" resize.
size: (1100, 800)
// Logically, the <body> scroll width should be the width of the window.
assert-property: ("body", {"scrollWidth": "1100"})
// However, since there is overflow in the type declaration, its scroll width is bigger.
assert-property: (".type-decl pre", {"scrollWidth": "1324"})