Skip to content

Do not eat nested expressions' results in MayContainYieldPoint format args visitor#122680

Merged
bors merged 2 commits intorust-lang:masterfrom
lqd:nested-await-args
Mar 18, 2024
Merged

Do not eat nested expressions' results in MayContainYieldPoint format args visitor#122680
bors merged 2 commits intorust-lang:masterfrom
lqd:nested-await-args

Conversation

@lqd
Copy link
Member

@lqd lqd commented Mar 18, 2024

#121563 unintentionally changed the MayContainYieldPoint format args visitor behavior, now missing yield points in nested expressions, as seen in #122674.

The walk can find a yield point in an expression but it was ignored.

r? @petrochenkov as the reviewer of #121563
cc @Jarcho as the author

Fixes #122674.
We're in the 1.77 release week. #121563 will land on 1.78 but beta is still 1.77.9: this PR will likely need to be backported soon after beta is cut.

@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 Mar 18, 2024
@lqd lqd force-pushed the nested-await-args branch from 737311f to f3e9dfa Compare March 18, 2024 10:01
@apiraino
Copy link
Contributor

apiraino commented Mar 18, 2024

I will preemptively apply a reminder about the backport

@rustbot label beta-nominated

@rustbot rustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 18, 2024
compiler-errors
compiler-errors approved these changes Mar 18, 2024
View reviewed changes
Copy link
Contributor

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😱

@compiler-errors
Copy link
Contributor

compiler-errors commented Mar 18, 2024

Thank you lqd!

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 18, 2024

📌 Commit f3e9dfa has been approved by compiler-errors

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 Mar 18, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 18, 2024
@matthiaskrgr
Rollup merge of rust-lang#122680 - lqd:nested-await-args, r=compiler-…
b652055 
…errors

Do not eat nested expressions' results in `MayContainYieldPoint` format args visitor

rust-lang#121563 unintentionally changed the `MayContainYieldPoint` format args visitor behavior, now missing yield points in nested expressions, as seen in rust-lang#122674.

The walk can find a yield point in an expression but it was ignored.

r? `@petrochenkov` as the reviewer of rust-lang#121563
cc `@Jarcho` as the author

Fixes rust-lang#122674.
We're in the 1.77 release week. rust-lang#121563 will land on 1.78 but beta is still 1.77.9: this PR will likely need to be backported soon after beta is cut.
This was referenced Mar 18, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2024
@bors
Auto merge of rust-lang#122690 - matthiaskrgr:rollup-43fggl0, r=matth…
d31b6fb 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#122480 (Avoid various uses of `Option<Span>` in favor of using `DUMMY_SP` in the few cases that used `None`)
 - rust-lang#122567 (Remove fixme about LLVM basic block naming)
 - rust-lang#122588 (less useless filter calls in imported_source_file)
 - rust-lang#122647 (add_retag: ensure box-to-raw-ptr casts are preserved for Miri)
 - rust-lang#122649 (Update the minimum external LLVM to 17)
 - rust-lang#122680 (Do not eat nested expressions' results in `MayContainYieldPoint` format args visitor)
 - rust-lang#122683 (add missing test: expected paren or brace in macro)
 - rust-lang#122689 (Add missing `try_visit` calls in visitors.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 72e2c7c into rust-lang:master Mar 18, 2024
@rustbot rustbot added this to the 1.79.0 milestone Mar 18, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2024
@rust-timer
Unrolled build for rust-lang#122680
8ee3b74 
Rollup merge of rust-lang#122680 - lqd:nested-await-args, r=compiler-errors

Do not eat nested expressions' results in `MayContainYieldPoint` format args visitor

rust-lang#121563 unintentionally changed the `MayContainYieldPoint` format args visitor behavior, now missing yield points in nested expressions, as seen in rust-lang#122674.

The walk can find a yield point in an expression but it was ignored.

r? ``@petrochenkov`` as the reviewer of rust-lang#121563
cc ``@Jarcho`` as the author

Fixes rust-lang#122674.
We're in the 1.77 release week. rust-lang#121563 will land on 1.78 but beta is still 1.77.9: this PR will likely need to be backported soon after beta is cut.
@lqd lqd deleted the nested-await-args branch March 18, 2024 19:57
@lqd lqd mentioned this pull request Mar 24, 2024
Closed
@apiraino
Copy link
Contributor

apiraino commented Mar 24, 2024 •
edited
Loading

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 24, 2024
@cuviper cuviper mentioned this pull request Mar 28, 2024
Merged
@cuviper cuviper modified the milestones: 1.79.0, 1.78.0 Mar 28, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 28, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 28, 2024
@bors
Auto merge of rust-lang#123172 - cuviper:beta-next, r=cuviper
c21a2a1 
[beta] backports

- Do not eat nested expressions' results in `MayContainYieldPoint` format args visitor rust-lang#122680
- Fix heading anchors in doc pages. rust-lang#122693
- Make `#[diagnostic::on_unimplemented]` format string parsing more robust rust-lang#122402

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2024
@bors
Auto merge of rust-lang#123172 - cuviper:beta-next, r=cuviper
c119551 
[beta] backports

- Do not eat nested expressions' results in `MayContainYieldPoint` format args visitor rust-lang#122680
- Fix heading anchors in doc pages. rust-lang#122693
- Make `#[diagnostic::on_unimplemented]` format string parsing more robust rust-lang#122402
-  Update ninja on Windows rust-lang#123178

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@compiler-errors compiler-errors compiler-errors approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@petrochenkov petrochenkov

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. 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

Milestone

1.78.0

Development

Successfully merging this pull request may close these issues.

core::fmt::rt::Opaque not Sync caused future compile fail on nightly-2024-03-09

7 participants

@lqd @apiraino @compiler-errors @bors @cuviper @petrochenkov @rustbot