-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Handle errors during error recovery gracefully #62604
Conversation
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
Ok(Some(_)) => "method", | ||
Ok(None) => "function", | ||
Err(mut err) => { | ||
err.cancel(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You could also use .map_err(|e| e.cancel())
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
r=me
@bors r+ |
📌 Commit e1c7747 has been approved by |
I noted that @estebank mentioned in #62637 that this might warrant a stable point release. The release team has no current plans to conduct one, and it is somewhat harder to do this cycle, so we'd like to avoid it if possible -- is this sufficiently high impact to warrant that? It feels like it's not too severe to me? If you decide you would like to consider a stable release, please label this PR with the stable-nominated tag and ask compiler team to approve stable backport; if that all follows release team will discuss whether we would agree that this warrants a stable backport. To summarize, stable point release process is as follows:
|
@Mark-Simulacrum I should have linked to PR #62607, not this PR. That PR is already nominated and should be discussed next thursday. I feel that PR is certainly bad but not enough to justify a point release. |
Handle errors during error recovery gracefully Fix rust-lang#62546.
Rollup of 5 pull requests Successful merges: - #62577 (Add an AtomicCell abstraction) - #62585 (Make struct_tail normalize when possible) - #62604 (Handle errors during error recovery gracefully) - #62636 (rustbuild: Improve assert about building tools once) - #62651 (Make some rustc macros more hygienic) Failed merges: r? @ghost
Cancel unemitted diagnostics during error recovery Follow up to rust-lang#62604. Use @eddyb's preferred style and catch other case of the same problem. r? @eddyb
[beta] Rollup backports Cherry picked: * rustc_target: avoid negative register counts in the SysV x86_64 ABI. #62380 * Fix ICEs when `Self` is used in type aliases #62417 * Raise the default recursion limit to 128 #62450 * Handle errors during error recovery gracefully #62604 * Correctly break out of recovery loop #62607 * Cancel unemitted diagnostics during error recovery #62666 * ci: pin awscli dependencies #62856 * Ensure that checkout is with \n line endings #62564 Rolled up: * [beta] Backport #62615 #62793 * [beta] Fix #62660 #62792 r? @ghost
[beta] Rollup backports Cherry picked: * rustc_target: avoid negative register counts in the SysV x86_64 ABI. #62380 * Fix ICEs when `Self` is used in type aliases #62417 * Raise the default recursion limit to 128 #62450 * Handle errors during error recovery gracefully #62604 * Correctly break out of recovery loop #62607 * Cancel unemitted diagnostics during error recovery #62666 * ci: pin awscli dependencies #62856 * Ensure that checkout is with \n line endings #62564 Rolled up: * [beta] Backport #62615 #62793 * [beta] Fix #62660 #62792 r? @ghost
Fix #62546.