rebase

Author: WhyNovaa

compiler/rustc_hir_typeck/src/method/suggest.rs

@@ -43,6 +43,7 @@ use rustc_trait_selection::traits::{
     FulfillmentError, Obligation, ObligationCauseCode, supertraits,
 };
 use tracing::{debug, info, instrument};
+
 use super::probe::{AutorefOrPtrAdjustment, IsSuggestion, Mode, ProbeScope};
 use super::{CandidateSource, MethodError, NoMatchData};
 use crate::errors::{self, CandidateTraitNote, NoAssociatedItem};
@@ -3282,7 +3283,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
     /// Checks if we can suggest a derive macro for the unmet trait bound.
     /// Returns Some(list_of_derives) if possible, or None if not.
-    fn consider_suggesting_derives_for_ty(
+    fn check_derive(
         &self,
         trait_pred: ty::TraitPredicate<'tcx>,
         adt: ty::AdtDef<'tcx>,
@@ -3308,16 +3309,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
         let trait_def_id = trait_pred.def_id();
         let self_ty = trait_pred.self_ty();
+        let has_impl =
+            self.tcx.non_blanket_impls_for_ty(trait_def_id, self_ty).any(|impl_def_id| {
+                self.tcx
+                    .type_of(impl_def_id)
+                    .instantiate_identity()
+                    .ty_adt_def()
+                    .is_some_and(|def| def.did() == adt.did())
+            });
 
-        // We need to check if there is already a manual implementation of the trait
-        // for this specific ADT to avoid suggesting `#[derive(..)]` that would conflict.
-        if self.tcx.non_blanket_impls_for_ty(trait_def_id, self_ty).any(|impl_def_id| {
-            self.tcx
-                .type_of(impl_def_id)
-                .instantiate_identity()
-                .ty_adt_def()
-                .is_some_and(|def| def.did() == adt.did())
-        }) {
+        if has_impl {
             return None;
         }
 
@@ -3354,7 +3355,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 Some(adt) if adt.did().is_local() => adt,
                 _ => continue,
             };
-            if let Some(new_derives) = self.consider_suggesting_derives_for_ty(trait_pred, adt) {
+            if let Some(new_derives) = self.check_derive(trait_pred, adt) {
                 derives.extend(new_derives);
             } else {
                 traits.push(trait_pred.def_id());