aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_def/src/body
diff options
context:
space:
mode:
Diffstat (limited to 'crates/hir_def/src/body')
-rw-r--r--crates/hir_def/src/body/lower.rs16
1 files changed, 10 insertions, 6 deletions
diff --git a/crates/hir_def/src/body/lower.rs b/crates/hir_def/src/body/lower.rs
index 63e89a1f4..73e7aee33 100644
--- a/crates/hir_def/src/body/lower.rs
+++ b/crates/hir_def/src/body/lower.rs
@@ -322,8 +322,10 @@ impl ExprCollector<'_> {
322 Vec::new() 322 Vec::new()
323 }; 323 };
324 let method_name = e.name_ref().map(|nr| nr.as_name()).unwrap_or_else(Name::missing); 324 let method_name = e.name_ref().map(|nr| nr.as_name()).unwrap_or_else(Name::missing);
325 let generic_args = 325 let generic_args = e
326 e.generic_arg_list().and_then(|it| GenericArgs::from_ast(&self.ctx(), it)); 326 .generic_arg_list()
327 .and_then(|it| GenericArgs::from_ast(&self.ctx(), it))
328 .map(Box::new);
327 self.alloc_expr( 329 self.alloc_expr(
328 Expr::MethodCall { receiver, method_name, args, generic_args }, 330 Expr::MethodCall { receiver, method_name, args, generic_args },
329 syntax_ptr, 331 syntax_ptr,
@@ -385,7 +387,7 @@ impl ExprCollector<'_> {
385 self.alloc_expr(Expr::Yield { expr }, syntax_ptr) 387 self.alloc_expr(Expr::Yield { expr }, syntax_ptr)
386 } 388 }
387 ast::Expr::RecordExpr(e) => { 389 ast::Expr::RecordExpr(e) => {
388 let path = e.path().and_then(|path| self.expander.parse_path(path)); 390 let path = e.path().and_then(|path| self.expander.parse_path(path)).map(Box::new);
389 let record_lit = if let Some(nfl) = e.record_expr_field_list() { 391 let record_lit = if let Some(nfl) = e.record_expr_field_list() {
390 let fields = nfl 392 let fields = nfl
391 .fields() 393 .fields()
@@ -430,7 +432,7 @@ impl ExprCollector<'_> {
430 } 432 }
431 ast::Expr::CastExpr(e) => { 433 ast::Expr::CastExpr(e) => {
432 let expr = self.collect_expr_opt(e.expr()); 434 let expr = self.collect_expr_opt(e.expr());
433 let type_ref = TypeRef::from_ast_opt(&self.ctx(), e.ty()); 435 let type_ref = Box::new(TypeRef::from_ast_opt(&self.ctx(), e.ty()));
434 self.alloc_expr(Expr::Cast { expr, type_ref }, syntax_ptr) 436 self.alloc_expr(Expr::Cast { expr, type_ref }, syntax_ptr)
435 } 437 }
436 ast::Expr::RefExpr(e) => { 438 ast::Expr::RefExpr(e) => {
@@ -469,8 +471,10 @@ impl ExprCollector<'_> {
469 arg_types.push(type_ref); 471 arg_types.push(type_ref);
470 } 472 }
471 } 473 }
472 let ret_type = 474 let ret_type = e
473 e.ret_type().and_then(|r| r.ty()).map(|it| TypeRef::from_ast(&self.ctx(), it)); 475 .ret_type()
476 .and_then(|r| r.ty())
477 .map(|it| Box::new(TypeRef::from_ast(&self.ctx(), it)));
474 let body = self.collect_expr_opt(e.body()); 478 let body = self.collect_expr_opt(e.body());
475 self.alloc_expr(Expr::Lambda { args, arg_types, ret_type, body }, syntax_ptr) 479 self.alloc_expr(Expr::Lambda { args, arg_types, ret_type, body }, syntax_ptr)
476 } 480 }