rust-analyzer

diff --git a/crates/ide-assists/src/handlers/extract_function.rs b/crates/ide-assists/src/handlers/extract_function.rs
index f8315e39a6..5c76db4b7a 100644
--- a/crates/ide-assists/src/handlers/extract_function.rs
+++ b/crates/ide-assists/src/handlers/extract_function.rs

@@ -1879,7 +1879,7 @@ fn make_body(ctx: &AssistContext<'_>, old_indent: IndentLevel, fun: &Function) -

.iter()

.map(|var| path_expr_from_local(ctx, var.local, fun.mods.edition));

let expr = make::expr_tuple(exprs);

- tail_expr = Some(expr);

+ tail_expr = Some(expr.into());

}

};

@@ -2130,13 +2130,13 @@ fn make_rewritten_flow(handler: &FlowHandler, arg_expr: Option<ast::Expr>) -> Op

make::arg_list(iter::once(make::expr_unit())),

FlowHandler::IfOption { .. } => {

- let expr = arg_expr.unwrap_or_else(|| make::expr_tuple(Vec::new()));

+ let expr = arg_expr.unwrap_or_else(|| make::expr_unit());

let args = make::arg_list(iter::once(expr));

make::expr_call(make::expr_path(make::ext::ident_path("Some")), args)

}

FlowHandler::MatchOption { .. } => make::expr_path(make::ext::ident_path("None")),

FlowHandler::MatchResult { .. } => {

- let expr = arg_expr.unwrap_or_else(|| make::expr_tuple(Vec::new()));

+ let expr = arg_expr.unwrap_or_else(|| make::expr_unit());

let args = make::arg_list(iter::once(expr));

make::expr_call(make::expr_path(make::ext::ident_path("Err")), args)

}

diff --git a/crates/ide-assists/src/handlers/remove_dbg.rs b/crates/ide-assists/src/handlers/remove_dbg.rs
index 94274f6d17..31d4a33703 100644
--- a/crates/ide-assists/src/handlers/remove_dbg.rs
+++ b/crates/ide-assists/src/handlers/remove_dbg.rs

@@ -152,7 +152,7 @@ fn compute_dbg_replacement(macro_expr: ast::MacroExpr) -> Option<(TextRange, Opt

exprs => {

let exprs = exprs.iter().cloned().map(replace_nested_dbgs);

let expr = make::expr_tuple(exprs);

- (macro_call.syntax().text_range(), Some(expr))

+ (macro_call.syntax().text_range(), Some(expr.into()))

}

})

}

diff --git a/crates/ide-assists/src/handlers/unwrap_block.rs b/crates/ide-assists/src/handlers/unwrap_block.rs
index f3e7f5f416..c613947074 100644
--- a/crates/ide-assists/src/handlers/unwrap_block.rs
+++ b/crates/ide-assists/src/handlers/unwrap_block.rs

@@ -61,7 +61,7 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option

}

None => {

- let empty_tuple = make::expr_tuple([]);

+ let empty_tuple = make::expr_unit();

make::let_stmt(pattern, ty, Some(empty_tuple)).to_string()

}

};

diff --git a/crates/ide-assists/src/utils/gen_trait_fn_body.rs b/crates/ide-assists/src/utils/gen_trait_fn_body.rs
index 75caf6d49f..4ba6bd98e4 100644
--- a/crates/ide-assists/src/utils/gen_trait_fn_body.rs
+++ b/crates/ide-assists/src/utils/gen_trait_fn_body.rs

@@ -541,7 +541,7 @@ fn gen_partial_eq(adt: &ast::Adt, func: &ast::Fn, trait_ref: Option<TraitRef>) -

arms.push(make::match_arm(Some(lhs), None, rhs));

}

- let match_target = make::expr_tuple(vec![lhs_name, rhs_name]);

+ let match_target = make::expr_tuple([lhs_name, rhs_name]).into();

let list = make::match_arm_list(arms).indent(ast::edit::IndentLevel(1));

make::expr_match(match_target, list)

}

diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs
index dc966a81fe..812b0dc888 100644
--- a/crates/syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs

@@ -656,7 +656,7 @@ pub fn expr_field(receiver: ast::Expr, field: &str) -> ast::Expr {

pub fn expr_paren(expr: ast::Expr) -> ast::Expr {

expr_from_text(&format!("({expr})"))

}

-pub fn expr_tuple(elements: impl IntoIterator<Item = ast::Expr>) -> ast::Expr {

+pub fn expr_tuple(elements: impl IntoIterator<Item = ast::Expr>) -> ast::TupleExpr {

let expr = elements.into_iter().format(", ");

expr_from_text(&format!("({expr})"))

}

diff --git a/crates/syntax/src/syntax_editor.rs b/crates/syntax/src/syntax_editor.rs
index 992a847663..81c52e26cf 100644
--- a/crates/syntax/src/syntax_editor.rs
+++ b/crates/syntax/src/syntax_editor.rs

@@ -344,7 +344,8 @@ mod tests {

make::expr_literal("2").into(),

make::expr_literal("true").into(),

- ]),

+ ])

+ .into(),

);

let to_wrap = root.syntax().descendants().find_map(ast::TupleExpr::cast).unwrap();