bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

stop suggesting non-existing fully qualified paths

Browse source
This commit is contained in:
Takayuki Maeda 2022-05-11 19:18:02 +09:00
parent cb12198715
commit daeec7e22d
3 changed files with 75 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
compiler/rustc_infer/src/infer/error_reporting/need_type_info.rs
View file

@ -739,7 +739,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
{
let mut eraser = TypeParamEraser(self.tcx);
let candidate_len = impl_candidates.len();
let mut suggestions: Vec<_> = impl_candidates.iter().map(|candidate| {
let mut suggestions: Vec<_> = impl_candidates.iter().filter_map(|candidate| {
let trait_item = self.tcx
.associated_items(candidate.def_id)
.find_by_name_and_kind(
@ -748,6 +748,9 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
ty::AssocKind::Fn,
candidate.def_id
);
if trait_item.is_none() {
return None;
}
let prefix = if let Some(trait_item) = trait_item
&& let Some(trait_m) = trait_item.def_id.as_local()
&& let hir::TraitItemKind::Fn(fn_, _) = &self.tcx.hir().trait_item(hir::TraitItemId { def_id: trait_m }).kind
@ -761,24 +764,26 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
""
};
let candidate = candidate.super_fold_with(&mut eraser);
vec![
Some(vec![
(expr.span.shrink_to_lo(), format!("{}::{}({}", candidate, segment.ident, prefix)),
if exprs.len() == 1 {
(expr.span.shrink_to_hi().with_hi(e.span.hi()), ")".to_string())
} else {
(expr.span.shrink_to_hi().with_hi(exprs[1].span.lo()), ", ".to_string())
},
]
])
}).collect();
suggestions.sort_by(|a, b| a[0].1.cmp(&b[0].1));
err.multipart_suggestions(
&format!(
"use the fully qualified path for the potential candidate{}",
pluralize!(candidate_len),
),
suggestions.into_iter(),
Applicability::MaybeIncorrect,
);
if !suggestions.is_empty() {
err.multipart_suggestions(
&format!(
"use the fully qualified path for the potential candidate{}",
pluralize!(candidate_len),
),
suggestions.into_iter(),
Applicability::MaybeIncorrect,
);
}
}
// Suggest specifying type params or point out the return type of the call:
//