From 052404565ea495b32956373e18d807a8cde68ceb Mon Sep 17 00:00:00 2001 From: Arnaud Date: Mon, 4 Jan 2021 20:34:23 +0100 Subject: Remove `RetType` --- crates/hir/src/code_model.rs | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'crates/hir') diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs index a8b67da20..1a4aa78fb 100644 --- a/crates/hir/src/code_model.rs +++ b/crates/hir/src/code_model.rs @@ -744,19 +744,15 @@ impl Function { } /// Get this function's return type - /// - /// The returned type can be converted to a [`Type`] via its `ty` - /// method. - pub fn ret_type(self, db: &dyn HirDatabase) -> RetType { + pub fn ret_type(self, db: &dyn HirDatabase) -> Type { let resolver = self.id.resolver(db.upcast()); let ret_type = &db.function_data(self.id).ret_type; let ctx = hir_ty::TyLoweringContext::new(db, &resolver); let environment = TraitEnvironment::lower(db, &resolver); - let ty = Type { + Type { krate: self.id.lookup(db.upcast()).container.module(db.upcast()).krate, ty: InEnvironment { value: Ty::from_hir_ext(&ctx, ret_type).0, environment }, - }; - RetType { ty } + } } pub fn self_param(self, db: &dyn HirDatabase) -> Option { @@ -842,17 +838,6 @@ impl From for Access { } } -#[derive(Debug)] -pub struct RetType { - ty: Type, -} - -impl RetType { - pub fn ty(&self) -> &Type { - &self.ty - } -} - #[derive(Debug)] pub struct Param { ty: Type, -- cgit v1.2.3