Skip to content

Fix horizontal trim for block doc comments #93715

New issue

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

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

Already on GitHub? # to your account

Merged
merged 3 commits into from
Feb 8, 2022

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Feb 6, 2022

Fixes #93662.
Fixes #93309.

r? @notriddle

@GuillaumeGomez GuillaumeGomez added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Feb 6, 2022
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 6, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 6, 2022
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez
Copy link
Member Author

Should be better now. :)

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez
Copy link
Member Author

With fmt it's better. :)

@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 7, 2022

📌 Commit a476ec8 has been approved by notriddle

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 7, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 8, 2022
…askrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#86497 (Add {floor,ceil}_char_boundary methods to str)
 - rust-lang#92695 (Add `#[no_coverage]` tests for nested functions)
 - rust-lang#93521 (Fix hover effects in sidebar)
 - rust-lang#93568 (Include all contents of first line of scraped item in Rustdoc)
 - rust-lang#93569 (rustdoc: correct unclosed HTML tags as generics)
 - rust-lang#93672 (update comment wrt const param defaults)
 - rust-lang#93715 (Fix horizontal trim for block doc comments)
 - rust-lang#93721 (rustdoc: Special-case macro lookups less)
 - rust-lang#93728 (Add in ValuePair::Term)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7d5e2ac into rust-lang:master Feb 8, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 8, 2022
@GuillaumeGomez GuillaumeGomez deleted the horizontal-trim branch February 8, 2022 10:09
@petrochenkov
Copy link
Contributor

@GuillaumeGomez
The test src/test/rustdoc-ui/block-doc-comment.stdout is causing spurious failures.
It has this line

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

but the time is not always 0.00s, it sometimes takes longer.
It needs to be normalized to $TIME, like in other similar tests.

@GuillaumeGomez
Copy link
Member Author

Good catch! Sending a fix right away!

JohnTitor added a commit to JohnTitor/rust that referenced this pull request May 3, 2022
…-test, r=petrochenkov

Fix flaky rustdoc-ui test because it did not replace time result

As mentioned in rust-lang#93715: a test is flaky because I forgot to replace the time value.

This PR fixes it.

r? `@petrochenkov`
JohnTitor added a commit to JohnTitor/rust that referenced this pull request May 4, 2022
…-test, r=petrochenkov

Fix flaky rustdoc-ui test because it did not replace time result

As mentioned in rust-lang#93715: a test is flaky because I forgot to replace the time value.

This PR fixes it.

r? ``@petrochenkov``
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
7 participants