diff options
| author | bors <bors@rust-lang.org> | 2022-04-07 00:15:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-07 00:15:18 +0000 |
| commit | 2310da432ca1c3e87f1d17e069f2336f2d4939e5 (patch) | |
| tree | 123f2f68946cdb98b500b4d5bd71828c221a222c /src | |
| parent | 8f36334ca939a67cce3f37f24953ff6f2d3f3d33 (diff) | |
| parent | fe6d69f4103086e07b7c3996ff5dc886646734e8 (diff) | |
| download | rust-2310da432ca1c3e87f1d17e069f2336f2d4939e5.tar.gz rust-2310da432ca1c3e87f1d17e069f2336f2d4939e5.zip | |
Auto merge of #95745 - Dylan-DPC:rollup-485ajqi, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #95185 (Stabilize Stdin::lines.) - #95626 (Don't cast thread name to an integer for prctl) - #95709 (Improve terse test output.) - #95735 (Revert "Mark Location::caller() as #[inline]") - #95738 (Switch item-info from div to span) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 6 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 4 | ||||
| -rw-r--r-- | src/test/rustdoc/stability.rs | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index e223b306505..12da16527a0 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -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>"); } } @@ -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); } } diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index ee265b8c4b5..68c88b551ca 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -737,6 +737,10 @@ h2.location a { border: none; } +.item-info { + display: block; +} + .content .item-info code { font-size: 0.875rem; } diff --git a/src/test/rustdoc/stability.rs b/src/test/rustdoc/stability.rs index 4ff06d9c995..90be2050d92 100644 --- a/src/test/rustdoc/stability.rs +++ b/src/test/rustdoc/stability.rs @@ -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, |
