bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove astconv usage in diagnostic

Browse source
This commit is contained in:
Michael Goulet 2023-02-07 23:08:25 +00:00
parent e4dd9edb76
commit 6fdfdea8b1
3 changed files with 67 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
View file

@ -1336,16 +1336,17 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
hir::Path { segments: [segment], .. },
))
| hir::ExprKind::Path(QPath::TypeRelative(ty, segment)) => {
let self_ty = self.astconv().ast_ty_to_ty(ty);
if let Ok(pick) = self.probe_for_name(
Mode::Path,
Ident::new(capitalized_name, segment.ident.span),
Some(expected_ty),
IsSuggestion(true),
self_ty,
expr.hir_id,
ProbeScope::TraitsInScope,
) {
if let Some(self_ty) = self.typeck_results.borrow().node_type_opt(ty.hir_id)
&& let Ok(pick) = self.probe_for_name(
Mode::Path,
Ident::new(capitalized_name, segment.ident.span),
Some(expected_ty),
IsSuggestion(true),
self_ty,
expr.hir_id,
ProbeScope::TraitsInScope,
)
{
(pick.item, segment)
} else {
return false;