Skip to content

Commit

Permalink
Rollup merge of #95738 - GuillaumeGomez:item-info-switch-to-span, r=jsha
Browse files Browse the repository at this point in the history
Switch item-info from div to span

Following discussion in #95684.

cc `@jsha`
r? `@notriddle`
  • Loading branch information
Dylan-DPC authored Apr 6, 2022
2 parents b22df08 + 56d0f94 commit fe6d69f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/librustdoc/html/render/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -597,11 +597,11 @@ fn document_item_info(
) {
let item_infos = short_item_info(item, cx, parent);
if !item_infos.is_empty() {
w.write_str("<div class=\"item-info\">");
w.write_str("<span class=\"item-info\">");
for info in item_infos {
w.write_str(&info);
}
w.write_str("</div>");
w.write_str("</span>");
}
}

Expand Down Expand Up @@ -1772,7 +1772,7 @@ pub(crate) fn render_impl_summary(
let is_trait = i.inner_impl().trait_.is_some();
if is_trait {
if let Some(portability) = portability(&i.impl_item, Some(parent)) {
write!(w, "<div class=\"item-info\">{}</div>", portability);
write!(w, "<span class=\"item-info\">{}</span>", portability);
}
}

Expand Down
4 changes: 4 additions & 0 deletions src/librustdoc/html/static/css/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,10 @@ h2.location a {
border: none;
}

.item-info {
display: block;
}

.content .item-info code {
font-size: 0.875rem;
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/rustdoc/stability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

pub struct Unstable {
// @has stability/struct.Unstable.html \
// '//div[@class="item-info"]//div[@class="stab unstable"]' \
// '//span[@class="item-info"]//div[@class="stab unstable"]' \
// 'This is a nightly-only experimental API'
// @count stability/struct.Unstable.html '//span[@class="stab unstable"]' 0
pub foo: u32,
Expand Down

0 comments on commit fe6d69f

Please sign in to comment.