Skip to content

Commit 13a7918

Browse files
committed
Ignore auto-deref for multiple crate version note
As per the case presented in #128569, we should be showing the extra info even if auto-deref is involved.
1 parent d03d9a2 commit 13a7918

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

compiler/rustc_hir_typeck/src/method/suggest.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -3491,21 +3491,21 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
34913491
// self types and rely on the suggestion to `use` the trait from
34923492
// `suggest_valid_traits`.
34933493
let did = Some(pick.item.container_id(self.tcx));
3494-
let skip = skippable.contains(&did);
3495-
if pick.autoderefs == 0 && !skip {
3496-
suggest = self.detect_and_explain_multiple_crate_versions(
3497-
err,
3498-
pick.item.def_id,
3494+
if skippable.contains(&did) {
3495+
continue;
3496+
}
3497+
suggest = self.detect_and_explain_multiple_crate_versions(
3498+
err,
3499+
pick.item.def_id,
3500+
pick.item.ident(self.tcx).span,
3501+
rcvr.hir_id.owner,
3502+
*rcvr_ty,
3503+
);
3504+
if pick.autoderefs == 0 && suggest {
3505+
err.span_label(
34993506
pick.item.ident(self.tcx).span,
3500-
rcvr.hir_id.owner,
3501-
*rcvr_ty,
3507+
format!("the method is available for `{rcvr_ty}` here"),
35023508
);
3503-
if suggest {
3504-
err.span_label(
3505-
pick.item.ident(self.tcx).span,
3506-
format!("the method is available for `{rcvr_ty}` here"),
3507-
);
3508-
}
35093509
}
35103510
break;
35113511
}

0 commit comments

Comments
 (0)