runtime: mark JoinHandle as UnwindSafe (#4414) #4418
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
|
Fixes: #4414 |
Darksonn
reviewed
Jan 23, 2022
tokio/src/runtime/task/join.rs
Outdated
Comment on lines
154
to
155
| impl<T: Send> UnwindSafe for JoinHandle<T> {} | ||
| impl<T: Send> RefUnwindSafe for JoinHandle<T> {} |
There was a problem hiding this comment.
Why should it not be unwind safe when T isn't Send?
tokio/tests/unwindsafe.rs
Outdated
Comment on lines
7
to
20
| #[tokio::test] | ||
| async fn futures_are_unwind_safe() { | ||
| unwind_safe_future(|| async { | ||
| let _ = spawn_blocking(|| {}).await; | ||
| }) | ||
| .await | ||
| } | ||
|
|
||
| async fn unwind_safe_future<F, Fut>(_: F) | ||
| where | ||
| F: FnOnce() -> Fut, | ||
| Fut: std::future::Future<Output = ()> + std::panic::UnwindSafe, | ||
| { | ||
| } |
There was a problem hiding this comment.
That's a pretty convoluted way to test this.
There was a problem hiding this comment.
I agree, I altered it to test the actual change 🙂
|
It seems like circle CI isn't reporting success :-/ |
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.
Marking JoinHandle as UnwindSafe allows for more ergonomic panic handling resolving this example: https://play.rust-lang.org/?version=stable&mode=debug&edition=2021&gist=77e8b4432bd28f50080cbae9eb26b8ae
Motivation
Solution