squash me before merge

Author: HKalbasi

crates/hir/src/lib.rs

@@ -66,7 +66,7 @@ use itertools::Itertools;
 use nameres::diagnostics::DefDiagnosticKind;
 use once_cell::unsync::Lazy;
 use rustc_hash::FxHashSet;
-use stdx::{format_to, impl_from};
+use stdx::{format_to, impl_from, never};
 use syntax::{
     ast::{self, HasAttrs as _, HasName},
     AstNode, AstPtr, SmolStr, SyntaxKind, SyntaxNodePtr,
@@ -2232,7 +2232,13 @@ impl ConstParam {
 
     pub fn name(self, db: &dyn HirDatabase) -> Name {
         let params = db.generic_params(self.id.parent);
-        params.types[self.id.local_id].name().unwrap().clone()
+        match params.types[self.id.local_id].name() {
+            Some(x) => x.clone(),
+            None => {
+                never!();
+                Name::missing()
+            }
+        }
     }
 
     pub fn module(self, db: &dyn HirDatabase) -> Module {
@@ -2285,15 +2291,10 @@ impl TypeOrConstParam {
     }
 
     pub fn ty(self, db: &dyn HirDatabase) -> Type {
-        let def = self.id.parent;
-        let krate = def.module(db.upcast()).krate();
-        if let Some(ty) = db.const_param_ty(self.id) {
-            return Type::new(db, krate, def, ty);
+        match self.split(db) {
+            Either::Left(x) => x.ty(db),
+            Either::Right(x) => x.ty(db),
         }
-        let resolver = self.id.parent.resolver(db.upcast());
-        let krate = self.id.parent.module(db.upcast()).krate();
-        let ty = TyKind::Placeholder(hir_ty::to_placeholder_idx(db, self.id)).intern(Interner);
-        Type::new_with_resolver_inner(db, krate, &resolver, ty)
     }
 }