From 54d60fdee9a49e2081837cc6445c61dec0b303af Mon Sep 17 00:00:00 2001 From: cynecx Date: Sat, 29 May 2021 18:16:20 +0200 Subject: hir_ty: use async ret type for inference inside async bodies --- crates/hir_def/src/item_tree/lower.rs | 8 +++++--- crates/hir_def/src/item_tree/pretty.rs | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'crates/hir_def/src/item_tree') diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs index b83adec46..6208facd5 100644 --- a/crates/hir_def/src/item_tree/lower.rs +++ b/crates/hir_def/src/item_tree/lower.rs @@ -356,12 +356,13 @@ impl<'a> Ctx<'a> { _ => TypeRef::unit(), }; - let ret_type = if func.async_token().is_some() { + let (ret_type, async_ret_type) = if func.async_token().is_some() { + let async_ret_type = ret_type.clone(); let future_impl = desugar_future_path(ret_type); let ty_bound = Interned::new(TypeBound::Path(future_impl)); - TypeRef::ImplTrait(vec![ty_bound]) + (TypeRef::ImplTrait(vec![ty_bound]), Some(async_ret_type)) } else { - ret_type + (ret_type, None) }; let abi = func.abi().map(lower_abi); @@ -395,6 +396,7 @@ impl<'a> Ctx<'a> { abi, params, ret_type: Interned::new(ret_type), + async_ret_type: async_ret_type.map(Interned::new), ast_id, flags, }; diff --git a/crates/hir_def/src/item_tree/pretty.rs b/crates/hir_def/src/item_tree/pretty.rs index d1ee697cb..cc9944a22 100644 --- a/crates/hir_def/src/item_tree/pretty.rs +++ b/crates/hir_def/src/item_tree/pretty.rs @@ -235,6 +235,7 @@ impl<'a> Printer<'a> { abi, params, ret_type, + async_ret_type: _, ast_id: _, flags, } = &self.tree[it]; -- cgit v1.2.3