Skip to content

Fix type decl layout "overflow" #87162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2021
Merged

Fix type decl layout "overflow" #87162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59103d1
Fix layout overflow in type declaration
GuillaumeGomez Jul 15, 2021
25e7403
Add regression test for type declaration layout overflow
GuillaumeGomez Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/librustdoc/html/static/css/rustdoc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,9 @@ code, pre, a.test-arrow {
pre {
padding: 14px;
}
.type-decl pre {
overflow-x: auto;
}

.source .content pre {
padding: 20px;
Expand Down
7 changes: 7 additions & 0 deletions src/test/rustdoc-gui/src/lib2/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 8 additions & 0 deletions src/test/rustdoc-gui/type-declation-overflow.goml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"})