fix: Fix a panic when calling JoinError::into_panic
#461
+47
−4
Conversation
This file contains hidden or 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
Hywan
force-pushed
the
fix-runtime-panic
branch
from
9a081a7 to
eda9841
Compare
That's a lot of panics. This patch fixes a panic raised by `JoinError:into_panic` when the `JoinError` represents a cancellation instead of a panic.
Hywan
force-pushed
the
fix-runtime-panic
branch
from
eda9841 to
3086626
Compare
Hywan
added a commit
to Hywan/matrix-rust-sdk
that referenced
this pull request
Jan 30, 2026
This patch replaces the `interact(…).unwrap()` by a proper error. So far, `interact()` was only returning `InteractError::Panic` despites `InteractError::Aborted` exists. With deadpool-rs/deadpool#461, we now get `InteractError::Aborted` when the SDK is shutdown, sometimes. This results in hitting the `unwrap` and having a panic again. This patch solves the problem by changing the `unwrap` to a proper error. Note: in case of `InteractError::Panic`, we continue to panic. This patch makes sense with or without the merge of the PR on `deadpool`.
Hywan
added a commit
to matrix-org/matrix-rust-sdk
that referenced
this pull request
Jan 30, 2026
This patch replaces the `interact(…).unwrap()` by a proper error. So far, `interact()` was only returning `InteractError::Panic` despites `InteractError::Aborted` exists. With deadpool-rs/deadpool#461, we now get `InteractError::Aborted` when the SDK is shutdown, sometimes. This results in hitting the `unwrap` and having a panic again. This patch solves the problem by changing the `unwrap` to a proper error. Note: in case of `InteractError::Panic`, we continue to panic. This patch makes sense with or without the merge of the PR on `deadpool`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
That's a lot of panics. This patch fixes a panic raised by
JoinError:into_panicwhen theJoinErrorrepresents a cancellation instead of a panic.deadpool-runtime#460