Suggest associated type when the specified one cannot be found #67406
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
ohadravid
force-pushed
the
suggest-assoc-type
branch
from
e9d418f to
ce57747
Compare
estebank
approved these changes
Dec 18, 2019
src/librustc_typeck/astconv.rs
Outdated
| .filter_map(|(p, _)| p.to_opt_poly_trait_ref()); | ||
|
|
||
| traits::transitive_bounds(tcx, bounds) | ||
| }, | ||
| ¶m_name.as_str(), | ||
| assoc_name, | ||
| span) |
There was a problem hiding this comment.
Could you clean this up to be a bit terser?
self.one_bound_for_assoc_type(
|| traits::transitive_bounds(tcx, predicates.iter()
.filter_map(|(p, _)| p.to_opt_poly_trait_ref())),
¶m_name.as_str(),
assoc_name,
span,
)
src/librustc_typeck/astconv.rs
Outdated
Comment on lines
1561
to
1596
| let mut err = struct_span_err!(self.tcx().sess, span, E0220, | ||
| "associated type `{}` not found for `{}`", | ||
| assoc_name, | ||
| ty_param_name) | ||
| .span_label(span, format!("associated type `{}` not found", assoc_name)) | ||
| .emit(); | ||
| ty_param_name); | ||
|
|
||
| let all_candidate_names: Vec<_> = all_candidates() | ||
| .map(|r| self.tcx().associated_items(r.def_id())) | ||
| .flatten() | ||
| .filter_map(|item| | ||
| if item.kind == ty::AssocKind::Type { | ||
| Some(item.ident.name) | ||
| } else { | ||
| None | ||
| } | ||
| ) | ||
| .collect(); | ||
|
|
||
| if let Some(suggested_name) = find_best_match_for_name( | ||
| all_candidate_names.iter(), | ||
| &assoc_name.as_str(), | ||
| None, | ||
| ) { | ||
| err.span_suggestion( | ||
| span, | ||
| "there is an associated type with a similar name", | ||
| suggested_name.to_string(), | ||
| Applicability::MaybeIncorrect, | ||
| ); | ||
| } else { | ||
| err.span_label( | ||
| span, | ||
| format!("associated type `{}` not found", assoc_name) | ||
| ); | ||
| } | ||
|
|
||
| err.emit(); |
There was a problem hiding this comment.
Could we move all this to a separate method called complain_about_assoc_type_not_found?
ohadravid
force-pushed
the
suggest-assoc-type
branch
from
ce57747 to
a4a2fc0
Compare
|
@bors r+ |
|
📌 Commit a4a2fc0 has been approved by |
|
🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 19, 2019
…ebank Suggest associated type when the specified one cannot be found Fixes rust-lang#67386, so code like this: ``` use std::ops::Deref; fn homura<T: Deref<Trget = i32>>(_: T) {} fn main() {} ``` results in: ``` error[E0220]: associated type `Trget` not found for `std::ops::Deref` --> type-binding.rs:6:20 | 6 | fn homura<T: Deref<Trget = i32>>(_: T) {} | ^^^^^^^^^^^ help: there is an associated type with a similar name: `Target` error: aborting due to previous error ``` (The `help` is new) I used an `all_candidates: impl Fn() -> Iterator<...>` instead of `collect`ing to avoid the cost of allocating the Vec when no errors are found, at the expense of a little added complexity. r? @estebank
bors
added a commit
that referenced
this pull request
Dec 19, 2019
Rollup of 8 pull requests Successful merges: - #67189 (Unify binop wording) - #67270 (std: Implement `LineWriter::write_vectored`) - #67286 (Fix the configure.py TOML field for a couple LLVM options) - #67321 (make htons const fn) - #67382 (Remove some unnecessary `ATTR_*` constants.) - #67389 (Remove `SO_NOSIGPIPE` dummy variable on platforms that don't use it.) - #67394 (Remove outdated references to @t from comments) - #67406 (Suggest associated type when the specified one cannot be found) 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.
Fixes #67386, so code like this:
results in:
(The
helpis new)I used an
all_candidates: impl Fn() -> Iterator<...>instead ofcollecting to avoid the cost of allocating the Vec when no errors are found, at the expense of a little added complexity.r? @estebank