diff options
| author | Zack M. Davis <code@zackmdavis.net> | 2018-11-18 22:21:38 -0800 |
|---|---|---|
| committer | Zack M. Davis <code@zackmdavis.net> | 2018-12-22 17:40:48 -0800 |
| commit | 3986c964481a048100565c8d30b1937ec2eb516d (patch) | |
| tree | 89e89d7ca0def45c4bdd824e8b8c07186e5a72b9 /src/test/ui/enum | |
| parent | 2d3e909e4e68259e15ca2908ff9e854f0a68bbec (diff) | |
| download | rust-3986c964481a048100565c8d30b1937ec2eb516d.tar.gz rust-3986c964481a048100565c8d30b1937ec2eb516d.zip | |
enum type instead of variant suggestion unification
Weirdly, we were deciding between a help note and a structured suggestion based on whether the import candidate span was a dummy—but we weren't using that span in any case! The dummy-ness of the span (which appears to be a matter of this-crate vs. other-crate definition) isn't the right criterion by which we should decide whether it's germane to mention that "there is an enum variant"; instead, let's use the someness of `def` (which is used as the `has_unexpected_resolution` argument to `error_code`). Since `import_candidate_to_paths` has no other callers, we are free to stop returning the span and rename the function. By using `span_suggestions_`, we leverage the max-suggestions output limit already built in to the emitter, thus resolving #56028. In the matter of message wording, "you can" is redundant (and perhaps too informal); prefer the imperative.
Diffstat (limited to 'src/test/ui/enum')
| -rw-r--r-- | src/test/ui/enum/enum-variant-type-2.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/enum/enum-variant-type-2.stderr b/src/test/ui/enum/enum-variant-type-2.stderr index 7a786af71bb..eb869f5539f 100644 --- a/src/test/ui/enum/enum-variant-type-2.stderr +++ b/src/test/ui/enum/enum-variant-type-2.stderr @@ -5,7 +5,7 @@ LL | fn foo(x: Foo::Bar) {} //~ ERROR expected type, found variant `Foo::Bar` | ^^^^^^^^ | | | not a type - | help: you can try using the variant's enum: `Foo` + | help: try using the variant's enum: `Foo` error: aborting due to previous error |
