fix: apply review feedbacks

JohnTitor · JohnTitor · commit 44042cc5c725 · 2026-01-28T21:10:14.000+09:00
diff --git a/compiler/rustc_hir_typeck/src/method/suggest.rs b/compiler/rustc_hir_typeck/src/method/suggest.rs
@@ -1065,11 +1065,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         for (predicate, _parent_pred, _cause) in unsatisfied_predicates {
             if let ty::PredicateKind::Clause(ty::ClauseKind::Trait(pred)) =
                 predicate.kind().skip_binder()
+                && let self_ty = pred.trait_ref.self_ty()
+                && self_ty.peel_refs() == rcvr_ty
             {
-                let self_ty = pred.trait_ref.self_ty();
-                if self_ty.peel_refs() != rcvr_ty {
-                    continue;
-                }
                 let is_ref = matches!(self_ty.kind(), ty::Ref(..));
                 tracker.track(pred.trait_ref.def_id, is_ref);
             }
@@ -1102,19 +1100,18 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             let is_ty_span = Some(span) == ty_span;
             if is_ty_span && should_condense {
                 ty_span.take();
-                err.span_label(
-                    span,
+                let label = if let Some(missing_trait_list) = &missing_trait_list {
+                    format!(
+                        "{item_kind} `{item_ident}` not found for this {} because `{rcvr_ty_str}` doesn't implement {missing_trait_list}",
+                        rcvr_ty.prefix_string(self.tcx)
+                    )
+                } else {
                     format!(
                         "{item_kind} `{item_ident}` not found for this {}",
                         rcvr_ty.prefix_string(self.tcx)
-                    ),
-                );
-                if let Some(missing_trait_list) = &missing_trait_list {
-                    err.span_label(
-                        span,
-                        format!("`{rcvr_ty_str}` doesn't implement {missing_trait_list}"),
-                    );
-                }
+                    )
+                };
+                err.span_label(span, label);
                 continue;
             }
             let pre = if is_ty_span {
diff --git a/tests/ui/proc-macro/quote/not-repeatable.stderr b/tests/ui/proc-macro/quote/not-repeatable.stderr
@@ -2,10 +2,7 @@ error[E0599]: the method `quote_into_iter` exists for struct `Ipv4Addr`, but its
   --> $DIR/not-repeatable.rs:11:13
    |
 LL | struct Ipv4Addr;
-   | ---------------
-   | |
-   | method `quote_into_iter` not found for this struct
-   | `Ipv4Addr` doesn't implement `Iterator` or `ToTokens`
+   | --------------- method `quote_into_iter` not found for this struct because `Ipv4Addr` doesn't implement `Iterator` or `ToTokens`
 ...
 LL |     let _ = quote! { $($ip)* };
    |             ^^^^^^^^^^^^^^^^^^ method cannot be called on `Ipv4Addr` due to unsatisfied trait bounds
diff --git a/tests/ui/traits/associated-item-unsatisfied-trait-bounds.stderr b/tests/ui/traits/associated-item-unsatisfied-trait-bounds.stderr
@@ -2,10 +2,7 @@ error[E0599]: the function or associated item `bat` exists for struct `Foo`, but
   --> $DIR/associated-item-unsatisfied-trait-bounds.rs:8:10
    |
 LL | struct Foo;
-   | ----------
-   | |
-   | function or associated item `bat` not found for this struct
-   | `Foo` doesn't implement `Bar` or `Baz`
+   | ---------- function or associated item `bat` not found for this struct because `Foo` doesn't implement `Bar` or `Baz`
 ...
 LL |     Foo::bat(());
    |          ^^^ function or associated item cannot be called on `Foo` due to unsatisfied trait bounds
