Skip to content
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

Jump to bottom

Update the std::thread docs and clarify that panics can nowadays be caught #45714

Merged
merged 4 commits into from
Nov 7, 2017
Merged

Update the std::thread docs and clarify that panics can nowadays be caught #45714

merged 4 commits into from
Nov 7, 2017

Conversation

sdroege
Copy link
Contributor

@sdroege sdroege commented Nov 2, 2017

No description provided.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @aturon (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 2, 2017
kennytm
kennytm reviewed Nov 2, 2017
View reviewed changes
src/libstd/thread/mod.rs Outdated
//! exit code.
//! owned resources. While not meant as a 'try/catch' mechanism, panics
//! in Rust can nonetheless be caught with
//! ['catch_unwind'](../../std/panic/fn.catch_unwind.html) and recovered
Copy link
Member

Choose a reason for hiding this comment

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

Better use backquotes (`…`) here (same for the resume_unwind below).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point, thanks. Will update in a bit
The wording is otherwise sounding OK?

Copy link
Member

Choose a reason for hiding this comment

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

Another suggestion :) This assumes that they can always be caught, but with panic=abort, they cannot still.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also a very good point :) Thanks

@carols10cents
Copy link
Member

r? @dtolnay

@rust-highfive rust-highfive assigned dtolnay and unassigned aturon Nov 6, 2017
@dtolnay
Copy link
Member

dtolnay commented Nov 6, 2017

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 6, 2017

📌 Commit b86bba5 has been approved by dtolnay

@kennytm kennytm 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 Nov 7, 2017
@kennytm kennytm mentioned this pull request Nov 7, 2017
Closed
kennytm added a commit to kennytm/rust that referenced this pull request Nov 7, 2017
@kennytm
Rollup merge of rust-lang#45714 - sdroege:thread-panic-docs, r=dtolnay
90c2a62 
Update the std::thread docs and clarify that panics can nowadays be caught
@kennytm kennytm mentioned this pull request Nov 7, 2017
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Nov 7, 2017
@kennytm
Rollup merge of rust-lang#45714 - sdroege:thread-panic-docs, r=dtolnay
264bfc4 
Update the std::thread docs and clarify that panics can nowadays be caught
bors added a commit that referenced this pull request Nov 7, 2017
@bors
Auto merge of #45822 - kennytm:rollup, r=kennytm
7f6417e 
Rollup of 9 pull requests

- Successful merges: #45470, #45588, #45682, #45714, #45751, #45764, #45778, #45782, #45784
- Failed merges:
@bors bors merged commit b86bba5 into rust-lang:master Nov 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm left review comments

@steveklabnik steveklabnik steveklabnik left review comments

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@sdroege @rust-highfive @carols10cents @dtolnay @bors @steveklabnik @kennytm @aturon