Skip to content

Conversation

@epage
Copy link
Contributor

@epage epage commented Oct 24, 2025

These same checks feed into doctest.can_be_merged, making them redundant.

These same checks feed into `doctest.can_be_merged`,
making them redundant.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Oct 24, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 24, 2025

r? @notriddle

rustbot has assigned @notriddle.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@epage
Copy link
Contributor Author

epage commented Oct 24, 2025

For quick reference:

rust/src/librustdoc/doctest.rs

Lines 1018 to 1023 in 27050c0

let is_standalone = !doctest.can_be_merged
|| scraped_test.langstr.compile_fail
|| scraped_test.langstr.test_harness
|| scraped_test.langstr.standalone_crate
|| self.rustdoc_options.nocapture
|| self.rustdoc_options.test_args.iter().any(|arg| arg == "--show-output");

let can_merge_doctests = can_merge_doctests
&& lang_str.is_some_and(|lang_str| {
!lang_str.compile_fail && !lang_str.test_harness && !lang_str.standalone_crate
});

@GuillaumeGomez
Copy link
Member

Thanks!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 24, 2025

📌 Commit aec6d51 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@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 Oct 24, 2025
jhpratt added a commit to jhpratt/rust that referenced this pull request Oct 25, 2025
refactor(rustdoc): Remove redundant langstr checks

These same checks feed into `doctest.can_be_merged`, making them redundant.
bors added a commit that referenced this pull request Oct 25, 2025
Rollup of 6 pull requests

Successful merges:

 - #147406 (Remove needs-asm-support directive in tests with explicit targets)
 - #147790 (constify comparison traits on slices)
 - #148056 (refactor(rustdoc): Remove redundant langstr checks)
 - #148065 (compiletest: Add concrete examples for some config/test path fields)
 - #148072 (Fix compiling `CondVar::wait_timeout` on 32-bit Apple platforms)
 - #148073 (test(frontmatter): Rename tests to make coverage more obvious)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Oct 25, 2025
Rollup of 5 pull requests

Successful merges:

 - #147406 (Remove needs-asm-support directive in tests with explicit targets)
 - #148056 (refactor(rustdoc): Remove redundant langstr checks)
 - #148065 (compiletest: Add concrete examples for some config/test path fields)
 - #148072 (Fix compiling `CondVar::wait_timeout` on 32-bit Apple platforms)
 - #148073 (test(frontmatter): Rename tests to make coverage more obvious)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit db5b487 into rust-lang:master Oct 25, 2025
11 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Oct 25, 2025
rust-timer added a commit that referenced this pull request Oct 25, 2025
Rollup merge of #148056 - epage:merged, r=GuillaumeGomez

refactor(rustdoc): Remove redundant langstr checks

These same checks feed into `doctest.can_be_merged`, making them redundant.
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Oct 27, 2025
Rollup of 5 pull requests

Successful merges:

 - rust-lang/rust#147406 (Remove needs-asm-support directive in tests with explicit targets)
 - rust-lang/rust#148056 (refactor(rustdoc): Remove redundant langstr checks)
 - rust-lang/rust#148065 (compiletest: Add concrete examples for some config/test path fields)
 - rust-lang/rust#148072 (Fix compiling `CondVar::wait_timeout` on 32-bit Apple platforms)
 - rust-lang/rust#148073 (test(frontmatter): Rename tests to make coverage more obvious)

r? `@ghost`
`@rustbot` modify labels: rollup
@epage epage deleted the merged branch October 27, 2025 16:31
@cuviper cuviper modified the milestones: 1.92.0, 1.93.0 Oct 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants