error_derive_forbidden_on_non_adt: be more graceful #69522
Merged
+39
−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
rust-highfive
added
the
S-waiting-on-review
Centril
added
beta-nominated
|
@bors r+ |
|
📌 Commit 13d42f4 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Feb 28, 2020
Rollup of 10 pull requests Successful merges: - #68989 (Update RELEASES.md for 1.42.0) - #69340 (instantiate_value_path: on `SelfCtor`, avoid unconstrained tyvars) - #69384 (parser: `token` -> `normalized_token`, `nonnormalized_token` -> `token`) - #69452 (typeck: use `Pattern` obligation cause more for better diagnostics) - #69481 (use char instead of &str for single char patterns) - #69522 (error_derive_forbidden_on_non_adt: be more graceful) - #69538 (Stabilize `boxed_slice_try_from`) - #69539 (late resolve, visit_fn: bail early if there's no body.) - #69541 (Remove unneeded calls to format!()) - #69547 (remove redundant clones, references to operands, explicit boolean comparisons and filter(x).next() calls.) Failed merges: r? @ghost
|
beta-accepted |
pnkfelix
added
the
beta-accepted
|
This does not backport cleanly -- the function this edits seems to be newly introduced on master, and as a stable/stable regression I don't think is super important to get backported, so I'm declining backport for now. We have a few days before promotion from beta to stable, though, so if someone (@Centril, presumably) backports this onto beta then I guess we can merge it in. |
|
It should be easy to backport the changes here onto beta; the function introduced was basically whole-sale extracted from a different function. I'll look at applying it to beta later. |
pietroalbini
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
Mar 9, 2020
[stable] Release 1.42.0 This PR prepares the release artifacts of Rust 1.42.0, and cherry-picks the following PRs: * #69754: Update deprecation version to 1.42 for Error::description * #69753: Do not ICE when matching an uninhabited enum's field * #69522 / #69853: error_derive_forbidden_on_non_adt: be more graceful * #68598: Fix null synthetic_implementors error In addition, the release notes are updated to include the remaining compatibility notes. r? @Centril
bors
added a commit
that referenced
this pull request
Mar 9, 2020
[stable] Release 1.42.0 This PR prepares the release artifacts of Rust 1.42.0, and cherry-picks the following PRs: * #69754: Update deprecation version to 1.42 for Error::description * #69753: Do not ICE when matching an uninhabited enum's field * #69522 / #69853: error_derive_forbidden_on_non_adt: be more graceful * #68598: Fix null synthetic_implementors error In addition, the release notes are updated to include the remaining compatibility notes. r? @Centril
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Fixes #69341 which was injected by #67052.
r? @petrochenkov