macros: allow temporary lifetime extension in select #6722
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Darksonn
added
A-tokio
Darksonn
commented
Jul 25, 2024
Comment on lines
+713
to
+719
| // regression test for https://github.com/tokio-rs/tokio/issues/6721 | ||
| #[tokio::test] | ||
| async fn temporary_lifetime_extension() { | ||
| tokio::select! { | ||
| () = &mut std::future::ready(()) => {}, | ||
| } | ||
| } |
There was a problem hiding this comment.
I have verified that this test does not compile without the fix.
mox692
approved these changes
Jul 25, 2024
wathenjiang
reviewed
Jul 25, 2024
| // Safety: Nothing must be moved out of `futures`. This is to | ||
| // satisfy the requirement of `Pin::new_unchecked` called below. | ||
| // | ||
| // We can't use the `pin!` macro for this because `futures` is a | ||
| // tuple and the standard library provides no way to pin-project to | ||
| // the fields of a tuple. | ||
| let mut futures = ( $( $crate::macros::support::IntoFuture::into_future($fut) , )+ ); | ||
| let mut futures = ($( $crate::macros::support::IntoFuture::into_future( | ||
| $crate::count_field!( futures_init.$($skip)* ) |
There was a problem hiding this comment.
Should we delete some indentations here?
Noah-Kennedy
approved these changes
Jul 25, 2024
kodiakhq bot
pushed a commit
to pdylanross/fatigue
that referenced
this pull request
Jul 29, 2024
Bumps tokio from 1.39.1 to 1.39.2. Release notes Sourced from tokio's releases. Tokio v1.39.2 1.39.2 (July 27th, 2024) This release fixes a regression where the select! macro stopped accepting expressions that make use of temporary lifetime extension. (#6722) #6722: tokio-rs/tokio#6722 Commits f602eae chore: prepare Tokio v1.39.2 (#6730) 438def7 macros: allow temporary lifetime extension in select (#6722) ee8d4d1 chore: fix ci failures (#6725) 3297052 ci: test Quinn in CI (#6719) See full diff in compare view Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase. Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: @dependabot rebase will rebase this PR @dependabot recreate will recreate this PR, overwriting any edits that have been made to it @dependabot merge will merge this PR after your CI passes on it @dependabot squash and merge will squash and merge this PR after your CI passes on it @dependabot cancel merge will cancel a previously requested merge and block automerging @dependabot reopen will reopen this PR if it is closed @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the 1.39.0 release, we merged #6710 which allows the use of
IntoFuturevalues withtokio::select!. Unfortunately, this resulted in a breaking change where the macro would no longer accept expressions that make use of temporary lifetime extension. This PR fixes the breaking change.Fixes: #6721