Avoid suggesting constrain the associated type to a trait

Author: chenyukang

compiler/rustc_resolve/src/late/diagnostics.rs

@@ -934,7 +934,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
     }
 
     fn suggest_trait_and_bounds(
-        &self,
+        &mut self,
         err: &mut Diag<'_>,
         source: PathSource<'_, '_, '_>,
         res: Option<Res>,
@@ -1479,7 +1479,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
     }
 
     /// Given `where <T as Bar>::Baz: String`, suggest `where T: Bar<Baz = String>`.
-    fn restrict_assoc_type_in_where_clause(&self, span: Span, err: &mut Diag<'_>) -> bool {
+    fn restrict_assoc_type_in_where_clause(&mut self, span: Span, err: &mut Diag<'_>) -> bool {
         // Detect that we are actually in a `where` predicate.
         let (bounded_ty, bounds, where_span) = if let Some(ast::WherePredicate {
             kind:
@@ -1539,6 +1539,18 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
                     &poly_trait_ref.trait_ref.path.segments[..]
                 {
                     if ident.span == span {
+                        let maybe_trait = !self
+                            .r
+                            .lookup_import_candidates(
+                                *ident,
+                                TypeNS,
+                                &self.parent_scope,
+                                &|res: Res| matches!(res, Res::Def(DefKind::Trait, _)),
+                            )
+                            .is_empty();
+                        if maybe_trait {
+                            return false;
+                        }
                         let Some(new_where_bound_predicate) =
                             mk_where_bound_predicate(path, poly_trait_ref, ty)
                         else {

tests/ui/traits/associated_type_bound/assoc-type-maybe-trait-147356.rs

@@ -0,0 +1,9 @@
+use std::str::FromStr;
+fn foo<T: FromStr>() -> T
+where
+    <T as FromStr>::Err: Debug, //~ ERROR expected trait
+{
+    "".parse().unwrap()
+}
+
+fn main() {}

tests/ui/traits/associated_type_bound/assoc-type-maybe-trait-147356.stderr

@@ -0,0 +1,14 @@
+error[E0404]: expected trait, found derive macro `Debug`
+  --> $DIR/assoc-type-maybe-trait-147356.rs:4:26
+   |
+LL |     <T as FromStr>::Err: Debug,
+   |                          ^^^^^ not a trait
+   |
+help: consider importing this trait instead
+   |
+LL + use std::fmt::Debug;
+   |
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0404`.