Skip to content

Commit

Permalink
Unrolled build for rust-lang#127418
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#127418 - GuillaumeGomez:wrap-too-long-type-name, r=notriddle

Wrap too long type name

Fixes rust-lang#120595.

Takeover of rust-lang#126209.

cc `@BradMarr`
r? `@notriddle`
  • Loading branch information
rust-timer authored Jul 19, 2024
2 parents 5affbb1 + c820a23 commit 4954f22
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
8 changes: 8 additions & 0 deletions src/librustdoc/html/static/css/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -2174,6 +2174,14 @@ in src-script.js and main.js
padding: 2px 4px;
box-shadow: 0 0 4px var(--main-background-color);
}

.item-table > li > .item-name {
width: 33%;
}
.item-table > li > div {
padding-bottom: 5px;
word-break: break-all;
}
}

@media print {
Expand Down
1 change: 1 addition & 0 deletions tests/rustdoc-gui/src/lib2/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ pub mod too_long {
pub type ReallyLongTypeNameLongLongLong =
Option<unsafe extern "C" fn(a: *const u8, b: *const u8) -> *const u8>;

/// Short doc.
pub const ReallyLongTypeNameLongLongLongConstBecauseWhyNotAConstRightGigaGigaSupraLong: u32 = 0;

/// This also has a really long doccomment. Lorem ipsum dolor sit amet,
Expand Down
6 changes: 5 additions & 1 deletion tests/rustdoc-gui/type-declation-overflow.goml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ assert-property: ("pre.item-decl", {"scrollWidth": "1324"})

// In the table-ish view on the module index, the name should not be wrapped more than necessary.
go-to: "file://" + |DOC_PATH| + "/lib2/too_long/index.html"
assert-property: (".item-table .struct", {"offsetWidth": "684"})

// We'll ensure that items with short documentation have the same width.
store-property: ("//*[@class='item-table']//*[@class='struct']/..", {"offsetWidth": offset_width})
assert: |offset_width| == "277"
assert-property: ("//*[@class='item-table']//*[@class='constant']/..", {"offsetWidth": |offset_width|})

// We now make the same check on type declaration...
go-to: "file://" + |DOC_PATH| + "/lib2/too_long/type.ReallyLongTypeNameLongLongLong.html"
Expand Down

0 comments on commit 4954f22

Please sign in to comment.