Skip to content

Return unexpected termination error instead of panicing in Thread::join #137480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 28, 2025
Merged

Return unexpected termination error instead of panicing in Thread::join #137480

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db1f0d0
Return error on unexpected termination in `Thread::join`.
fuzzypixelz Feb 23, 2025
1ccdc06
Remove speculation on cause of error
fuzzypixelz Feb 24, 2025
7058f62
Use `.expect(..)` instead
fuzzypixelz Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion library/std/src/thread/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,16 @@ struct JoinInner<'scope, T> {
impl<'scope, T> JoinInner<'scope, T> {
fn join(mut self) -> Result<T> {
self.native.join();
Arc::get_mut(&mut self.packet).unwrap().result.get_mut().take().unwrap()
Arc::get_mut(&mut self.packet)
// FIXME(fuzzypixelz): returning an error instead of panicking here
// would require updating the documentation of
// `std::thread::Result`; currently we can return `Err` if and only
// if the thread had panicked.
.expect("threads should not terminate unexpectedly")
.result
.get_mut()
.take()
.unwrap()
}
}

Expand Down
Loading