Skip to content

Relax test requirements for consistency#157300

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
zetanumbers:fix-note-on-different-line-tests
Jun 8, 2026
Merged

Relax test requirements for consistency#157300
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
zetanumbers:fix-note-on-different-line-tests

Conversation

@zetanumbers

Copy link
Copy Markdown
Contributor

That note occurring under the first emitted warning. Test tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs fails for parallel frontend due to its inconsistent order of diagnostics, which is fine on its own. As such this PR removes these note requirements and they are now only covered by force_warn_expected_lints_fulfilled.stderr, which is almost the same thing.

Updates #154314

r? @nnethercote

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 2, 2026
@petrochenkov petrochenkov self-assigned this Jun 2, 2026
Comment thread tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs Outdated
@petrochenkov

Copy link
Copy Markdown
Contributor

r=me with #157300 (comment) addressed (and commits squashed).
@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 3, 2026
@rustbot

rustbot commented Jun 3, 2026

Copy link
Copy Markdown
Collaborator

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@zetanumbers zetanumbers force-pushed the fix-note-on-different-line-tests branch from bdc23a4 to 1fc09be Compare June 8, 2026 13:22
@rustbot

rustbot commented Jun 8, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@zetanumbers

Copy link
Copy Markdown
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 8, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@rust-bors

rust-bors Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 1fc09be has been approved by petrochenkov

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jun 8, 2026
rust-bors Bot pushed a commit that referenced this pull request Jun 8, 2026
…uwer

Rollup of 13 pull requests

Successful merges:

 - #147302 (asm! support for the Xtensa architecture)
 - #148820 (Add very basic "comptime" fn implementation)
 - #157299 (Fix unstable diagnostics in tests)
 - #143511 (Improve TLS codegen by marking the panic/init path as cold)
 - #154608 (Add `_value` API for number literals in proc-macro)
 - #156762 (xfs support in `test_rename_directory_to_non_empty_directory`)
 - #157300 (Relax test requirements for consistency)
 - #157383 (tests: codegen-llvm: Ignore BPF targets in c-variadic-opt)
 - #157413 (fix: don't suggest .into_iter() for .cloned()/.copied() on non-reference Option)
 - #157578 (Fix diagnostics for non-exhaustive destructuring assignments (#157553))
 - #157587 (explain that the size_of constant also serves to avoid optimizing away 'unused' size_of calls)
 - #157596 (test: remove ineffective link-extern-crate-with-drop-type test)
 - #157602 (rustdoc: Remove unnecessary fast path)
@rust-bors rust-bors Bot merged commit c603394 into rust-lang:main Jun 8, 2026
12 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 8, 2026
rust-timer added a commit that referenced this pull request Jun 8, 2026
Rollup merge of #157300 - zetanumbers:fix-note-on-different-line-tests, r=petrochenkov

Relax test requirements for consistency

That note occurring under the first emitted warning. Test `tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs` fails for parallel frontend due to its inconsistent order of diagnostics, which is fine on its own. As such this PR removes these note requirements and they are now only covered by `force_warn_expected_lints_fulfilled.stderr`, which is almost the same thing.

Updates #154314

r? @nnethercote
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants