1
Fork 0

Fix rebase

This commit is contained in:
Esteban Küber 2024-02-22 18:38:10 +00:00
parent d67dcf5a8b
commit 91d0b371ef
4 changed files with 10 additions and 7 deletions

View file

@ -562,7 +562,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
None
};
let suggest_confusable = |err: &mut Diagnostic| {
let suggest_confusable = |err: &mut DiagnosticBuilder<'_>| {
let Some(call_name) = call_ident else {
return;
};

View file

@ -1418,7 +1418,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
fn find_likely_intended_associated_item(
&self,
err: &mut Diagnostic,
err: &mut DiagnosticBuilder<'_>,
similar_candidate: ty::AssocItem,
span: Span,
args: Option<&'tcx [hir::Expr<'tcx>]>,
@ -1496,7 +1496,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
pub(crate) fn confusable_method_name(
&self,
err: &mut Diagnostic,
err: &mut DiagnosticBuilder<'_>,
rcvr_ty: Ty<'tcx>,
item_name: Ident,
call_args: Option<Vec<Ty<'tcx>>>,