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.

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

Recommend panic::resume_unwind instead of panicking. #80169

Merged
merged 1 commit into from
Jan 14, 2021

Conversation

frewsxcv
Copy link
Member

Fixes #79950.

@rust-highfive
Copy link
Collaborator

r? @cramertj

(rust-highfive has picked a reviewer for you, use r? to override)

Comment on lines -1192 to +1193
/// match on the `Err` variant and handle the panic in an appropriate way.
/// match on the `Err` variant and handle the panic in an appropriate way

Choose a reason for hiding this comment

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

Why remove the period? It's a complete sentence even though it is formatted with an enumeration.

Copy link
Member Author

Choose a reason for hiding this comment

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

The statement on its own is not a complete sentence

Comment on lines +1199 to +1200
/// Matching on the result of a joined thread:
///

Choose a reason for hiding this comment

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

This seems to mean that the example is going to show case (2) above. However, the example below is changed from case (2) to case (1). Which one is correct/intended? Or should there be two examples?

Copy link
Member Author

Choose a reason for hiding this comment

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

Previously it was just demonstrating matching. Now it is demonstrating matching and the panic_unwind.

@frewsxcv frewsxcv added the A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools label Jan 8, 2021
@jyn514
Copy link
Member

jyn514 commented Jan 13, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 13, 2021

📌 Commit 3ea744e has been approved by jyn514

@bors bors 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 Jan 13, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2021
Recommend panic::resume_unwind instead of panicking.

Fixes rust-lang#79950.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2021
Recommend panic::resume_unwind instead of panicking.

Fixes rust-lang#79950.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2021
Recommend panic::resume_unwind instead of panicking.

Fixes rust-lang#79950.
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Jan 14, 2021
Recommend panic::resume_unwind instead of panicking.

Fixes rust-lang#79950.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 14, 2021
Rollup of 17 pull requests

Successful merges:

 - rust-lang#79982 (Add missing methods to unix ExitStatusExt)
 - rust-lang#80017 (Suggest `_` and `..` if a pattern has too few fields)
 - rust-lang#80169 (Recommend panic::resume_unwind instead of panicking.)
 - rust-lang#80217 (Add a `std::io::read_to_string` function)
 - rust-lang#80444 (Add as_ref and as_mut methods for Bound)
 - rust-lang#80567 (Add Iterator::intersperse_with)
 - rust-lang#80829 (Get rid of `DepConstructor`)
 - rust-lang#80895 (Fix handling of malicious Readers in read_to_end)
 - rust-lang#80966 (Deprecate atomic::spin_loop_hint in favour of hint::spin_loop)
 - rust-lang#80969 (Use better ICE message when no MIR is available)
 - rust-lang#80972 (Remove unstable deprecated Vec::remove_item)
 - rust-lang#80973 (Update books)
 - rust-lang#80980 (Fixed incorrect doc comment)
 - rust-lang#80981 (Fix -Cpasses=list and llvm version print with -vV)
 - rust-lang#80985 (Fix stabilisation version of slice_strip)
 - rust-lang#80990 (llvm: Remove the unused context from CreateDebugLocation)
 - rust-lang#80991 (Fix formatting specifiers doc links)

Failed merges:

 - rust-lang#80944 (Use Option::map_or instead of `.map(..).unwrap_or(..)`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 930371b into rust-lang:master Jan 14, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
7 participants