tweak discriminant on non-nullary enum diagnostic #61056
Merged
Conversation
This file contains 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
estebank
approved these changes
May 22, 2019
Centril
reviewed
May 23, 2019
Centril
reviewed
May 23, 2019
src/libsyntax/parse/parser.rs
Outdated
| if let VariantData::Struct(fields, ..) | VariantData::Tuple(fields, ..) = | ||
| &variant.node.data | ||
| { | ||
| let fields = if fields.len() > 1 { |
There was a problem hiding this comment.
@estebank Feels like we should have a general framework for these sorts of things...? trait Article?
euclio
force-pushed
the
custom-discriminant-error
branch
from
8d02ca6
to
214a9af
Compare
Adds notes pointing at the non-nullary variants, and uses "custom discriminant" language to be consistent with the Reference.
euclio
force-pushed
the
custom-discriminant-error
branch
from
214a9af
to
3cbf586
Compare
|
@estebank Comments addressed. |
|
@bors r+ |
|
📌 Commit 3cbf586 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 23, 2019
…=estebank tweak discriminant on non-nullary enum diagnostic Adds notes pointing at the non-nullary variants, and uses "custom discriminant" language to be consistent with the Reference. Fixes rust-lang#61039. r? @estebank
bors
added a commit
that referenced
this pull request
May 24, 2019
Rollup of 6 pull requests Successful merges: - #59545 (Use arenas to avoid Lrc in queries #2) - #61054 (Suggest dereferencing on assignment to mutable borrow) - #61056 (tweak discriminant on non-nullary enum diagnostic) - #61082 (fix dangling reference in Vec::append) - #61086 (Box::into_unique: do the reborrow-to-raw *after* destroying the Box) - #61098 (Fix overflowing literal lint in loops) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Adds notes pointing at the non-nullary variants, and uses "custom
discriminant" language to be consistent with the Reference.
Fixes #61039.
r? @estebank