Make the span more relevant to possible match

Author: iSwapna

compiler/rustc_hir_typeck/src/method/suggest.rs

@@ -1241,27 +1241,27 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         }
         // Only if an appropriate error source is not found, check method chain for possible candiates
         let error_source_not_found = unsatisfied_predicates.is_empty();
-        if error_source_not_found && let Mode::MethodCall = mode && let SelfSource::MethodCall(mut rcvr_expr) = source {
-        while let hir::ExprKind::MethodCall(_path_segment, parent_expr, _args, method_span) =
-        rcvr_expr.kind
+        if error_source_not_found && let Mode::MethodCall = mode && let SelfSource::MethodCall(mut source_expr) = source {
+        while let hir::ExprKind::MethodCall(_path_segment, rcvr_expr, _args, _span) =
+        source_expr.kind
             {
-                let prev_ty = self.resolve_vars_if_possible(
+                let rcvr_ty = self.resolve_vars_if_possible(
                     self.typeck_results
                         .borrow()
-                        .expr_ty_adjusted_opt(parent_expr)
+                        .expr_ty_adjusted_opt(rcvr_expr)
                         .unwrap_or(Ty::new_misc_error(self.tcx)),);
 
                 for _matched_method in self.probe_for_name_many(
                     Mode::MethodCall,
                     item_name,
                     None,
                     IsSuggestion(true),
-                    prev_ty,
-                    rcvr_expr.hir_id,
+                    rcvr_ty,
+                    source_expr.hir_id,
                     ProbeScope::TraitsInScope,) {
-                        err.span_label(method_span, format!("{item_kind} `{item_name}` is available on `{prev_ty}`"));
+                        err.span_label(rcvr_expr.span, format!("{item_kind} `{item_name}` is available on `{rcvr_ty}`"));
                     }
-                    rcvr_expr = parent_expr;
+                    source_expr = rcvr_expr;
 
             }
         }

tests/ui/structs/method-chain-expression-failure.stderr

@@ -5,9 +5,9 @@ LL | struct D;
    | -------- method `foo` not found for this struct
 ...
 LL |     A.b().c().d().foo();
-   |           ---     ^^^ method not found in `D`
-   |           |
-   |           method `foo` is available on `&B`
+   |     -----         ^^^ method not found in `D`
+   |     |
+   |     method `foo` is available on `&B`
 
 error: aborting due to previous error