Auto merge of #105690 - matthiaskrgr:rollup-khtq97k, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #105642 (Minor grammar nit.) - #105658 (Remove ..X from RELEASES.md) - #105663 (Adjust log line in `fuchsia-test-runner.py`) - #105664 (rustdoc: apply `pre-wrap` CSS to code-wrapped links) - #105665 (rustdoc: simplify popover CSS) - #105676 (rustdoc: add CSS margin between `impl` docblock and its items) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
ba64ba8b0d
7 changed files with 35 additions and 11 deletions
|
|
@ -7,3 +7,7 @@ show-text: true // We need to enable text draw to be able to have the "real" siz
|
|||
// Little explanations for this test: if the text wasn't displayed on two lines, it would take
|
||||
// around 20px (which is the font size).
|
||||
assert-property: (".docblock p > code", {"offsetHeight": "44"})
|
||||
|
||||
// Same check, but where the long code block is also a link
|
||||
goto: "file://" + |DOC_PATH| + "/test_docs/long_code_block_link/index.html"
|
||||
assert-property: (".docblock p > a > code", {"offsetHeight": "44"})
|
||||
|
|
|
|||
9
src/test/rustdoc-gui/impl-doc.goml
Normal file
9
src/test/rustdoc-gui/impl-doc.goml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
// A docblock on an impl must have a margin to separate it from the contents.
|
||||
goto: "file://" + |DOC_PATH| + "/test_docs/struct.TypeWithImplDoc.html"
|
||||
|
||||
// The text is about 24px tall, so if there's a margin, then their position will be >24px apart
|
||||
compare-elements-position-near-false: (
|
||||
"#implementations-list > .implementors-toggle > .docblock > p",
|
||||
"#implementations-list > .implementors-toggle > .impl-items",
|
||||
{"y": 24}
|
||||
)
|
||||
|
|
@ -154,6 +154,11 @@ pub mod huge_amount_of_consts {
|
|||
/// Very long code text `hereIgoWithLongTextBecauseWhyNotAndWhyWouldntI`.
|
||||
pub mod long_code_block {}
|
||||
|
||||
/// Very long code text [`hereIgoWithLongTextBecauseWhyNotAndWhyWouldntI`][lnk].
|
||||
///
|
||||
/// [lnk]: crate::long_code_block_link
|
||||
pub mod long_code_block_link {}
|
||||
|
||||
#[macro_export]
|
||||
macro_rules! repro {
|
||||
() => {};
|
||||
|
|
@ -442,3 +447,11 @@ pub mod trait_members {
|
|||
fn function2() {}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct TypeWithImplDoc;
|
||||
|
||||
/// impl doc
|
||||
impl TypeWithImplDoc {
|
||||
/// fn doc
|
||||
pub fn test_fn() {}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue