Merge #7732

7732: Don't lower TypeBound::Lifetime as GenericPredicate::Error r=flodiebold a=Veykril

Basically we just discard the typebound for now instead when lowering to `GenericPredicate`. I think this shouldn't have any other side effects?

Fixes #7683(hopefully for real this time)

I also played around with introducing `GenericPredicate::LifetimeOutlives` and `GenericPredicate::TypeOutlives`(see https://github.com/Veykril/rust-analyzer/commit/b9d69048451a5f2e9c5a72c800369bbeef36fdcf) but that won't fix this issue(at least not for now) due to lifetime predicate mismatches when resolving methods so I figure this is a good way to fix it for now.

Co-authored-by: Lukas Wirth <[email protected]>

1 files changed, 2 insertions, 3 deletions

diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs
index 021e4ad31..b3218833d 100644
--- a/crates/hir/src/code_model.rs
+++ b/crates/hir/src/code_model.rs
@@ -28,7 +28,7 @@ use hir_expand::{
 };
 use hir_ty::{
     autoderef,
-    display::{write_bounds_like_dyn_trait, HirDisplayError, HirFormatter},
+    display::{write_bounds_like_dyn_trait_with_prefix, HirDisplayError, HirFormatter},
     method_resolution,
     traits::{FnTrait, Solution, SolutionVariables},
     ApplicationTy, BoundVar, CallableDefId, Canonical, DebruijnIndex, FnSig, GenericPredicate,
@@ -1379,8 +1379,7 @@ impl HirDisplay for TypeParam {
         let substs = Substs::type_params(f.db, self.id.parent);
         let predicates = bounds.iter().cloned().map(|b| b.subst(&substs)).collect::<Vec<_>>();
         if !(predicates.is_empty() || f.omit_verbose_types()) {
-            write!(f, ": ")?;
-            write_bounds_like_dyn_trait(&predicates, f)?;
+            write_bounds_like_dyn_trait_with_prefix(":", &predicates, f)?;
         }
         Ok(())
     }