Merge #7815

7815: hir_ty: use default type generic for box expressions r=cynecx a=cynecx

r? @flodiebold

Fixes https://github.com/rust-analyzer/rust-analyzer/issues/6837 according to https://github.com/rust-analyzer/rust-analyzer/issues/6837#issuecomment-787456488.

Co-authored-by: cynecx <[email protected]>

1 files changed, 6 insertions, 0 deletions

diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs
index 13240f790..98bc23173 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir_ty/src/infer/expr.rs
@@ -488,6 +488,12 @@ impl<'a> InferenceContext<'a> {
                 if let Some(box_) = self.resolve_boxed_box() {
                     let mut sb = Substs::builder(generics(self.db.upcast(), box_.into()).len());
                     sb = sb.push(inner_ty);
+                    match self.db.generic_defaults(box_.into()).as_ref() {
+                        [_, alloc_ty, ..] if !alloc_ty.value.is_unknown() => {
+                            sb = sb.push(alloc_ty.value.clone());
+                        }
+                        _ => (),
+                    }
                     sb = sb.fill(repeat_with(|| self.table.new_type_var()));
                     Ty::Adt(box_, sb.build())
                 } else {