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

use suggestions for "enum instead of variant" error #59323

Merged
merged 1 commit into from
Mar 23, 2019

Conversation

euclio
Copy link
Contributor

@euclio euclio commented Mar 20, 2019

No description provided.

@rust-highfive
Copy link
Collaborator

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 20, 2019
.join("\n")));
if !variants.is_empty() {
let msg = if variants.len() == 1 {
"use the enum's variant"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"use the enum's variant"
"try using the enum's variant"

(For consistency with existing suggestions.)

let msg = if variants.len() == 1 {
"use the enum's variant"
} else {
"use one of the enum's variants"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"use one of the enum's variants"
"try using one of the enum's variants"

@varkor
Copy link
Member

varkor commented Mar 21, 2019

r=me with the minor phrasing change.

@euclio euclio force-pushed the enum-instead-of-variant branch from f2d62a8 to 16a8abe Compare March 21, 2019 15:18
@euclio
Copy link
Contributor Author

euclio commented Mar 21, 2019

@varkor Fixed.

@varkor
Copy link
Member

varkor commented Mar 21, 2019

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 21, 2019

📌 Commit 16a8abe has been approved by varkor

@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 Mar 21, 2019
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Mar 22, 2019
…arkor

use suggestions for "enum instead of variant" error
Centril added a commit to Centril/rust that referenced this pull request Mar 22, 2019
…arkor

use suggestions for "enum instead of variant" error
bors added a commit that referenced this pull request Mar 22, 2019
Rollup of 18 pull requests

Successful merges:

 - #59106 (Add peer_addr function to UdpSocket)
 - #59170 (Add const generics to rustdoc)
 - #59172 (Update and clean up several parts of CONTRIBUTING.md)
 - #59190 (consistent naming for Rhs type parameter in libcore/ops)
 - #59236 (Rename miri component to miri-preview)
 - #59266 (Do not complain about non-existing fields after parse recovery)
 - #59273 (some small HIR doc improvements)
 - #59291 (Make Option<ThreadId> no larger than ThreadId, with NonZeroU64)
 - #59297 (convert field/method confusion help to suggestions)
 - #59304 (Move some bench tests back from libtest)
 - #59309 (Add messages for different verbosity levels. Output copy actions.)
 - #59321 (Unify E0109, E0110 and E0111)
 - #59322 (Tweak incorrect escaped char diagnostic)
 - #59323 (use suggestions for "enum instead of variant" error)
 - #59327 (Add NAN test to docs)
 - #59329 (cleanup: Remove compile-fail-fulldeps directory again)
 - #59347 (Move one test from run-make-fulldeps to ui)
 - #59360 (Add tracking issue number for `seek_convenience`)

Failed merges:

r? @ghost
@bors bors merged commit 16a8abe into rust-lang:master Mar 23, 2019
@euclio euclio deleted the enum-instead-of-variant branch March 25, 2019 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants