rust-analyzer

diff --git a/crates/ide-assists/src/handlers/convert_range_for_to_while.rs b/crates/ide-assists/src/handlers/convert_range_for_to_while.rs
index 09435eeaec..6139395076 100644
--- a/crates/ide-assists/src/handlers/convert_range_for_to_while.rs
+++ b/crates/ide-assists/src/handlers/convert_range_for_to_while.rs

@@ -133,7 +133,7 @@ fn process_loop_body(

) -> Option<()> {

let last = previous_non_trivia_token(body.r_curly_token()?)?.syntax_element();

- let new_body = body.indent(1.into()).clone_subtree();

+ let new_body = body.indent(1.into());

let mut continues = vec![];

collect_continue_to(

&mut continues,

diff --git a/crates/ide-assists/src/handlers/generate_delegate_trait.rs b/crates/ide-assists/src/handlers/generate_delegate_trait.rs
index a9730994a5..abe447d9d9 100644
--- a/crates/ide-assists/src/handlers/generate_delegate_trait.rs
+++ b/crates/ide-assists/src/handlers/generate_delegate_trait.rs

@@ -363,9 +363,9 @@ fn generate_impl(

ast_strukt,

&old_impl,

&transform_args,

- trait_args.clone_subtree(),

+ trait_args.clone(),

) {

- *trait_args = new_args.clone_subtree();

+ *trait_args = new_args.clone();

Some(new_args)

} else {

None

diff --git a/crates/ide-assists/src/handlers/remove_dbg.rs b/crates/ide-assists/src/handlers/remove_dbg.rs
index 180c12f2ec..f4c354b8a2 100644
--- a/crates/ide-assists/src/handlers/remove_dbg.rs
+++ b/crates/ide-assists/src/handlers/remove_dbg.rs

@@ -163,7 +163,7 @@ fn compute_dbg_replacement(

None => false,

};

let expr = replace_nested_dbgs(expr.clone());

- let expr = if wrap { make::expr_paren(expr).into() } else { expr.clone_subtree() };

+ let expr = if wrap { make::expr_paren(expr).into() } else { expr };

(vec![macro_call.syntax().clone().into()], Some(expr))

}

// dbg!(expr0, expr1, ...)

diff --git a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
index 62b4e04950..04c9d8e54d 100644
--- a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
+++ b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs

@@ -220,10 +220,8 @@ fn impl_def_from_trait(

&impl_def,

&target_scope,

);

- let assoc_item_list = if let Some((first, other)) =

- assoc_items.split_first().map(|(first, other)| (first.clone_subtree(), other))

- {

- let first_item = if let ast::AssocItem::Fn(ref func) = first

+ let assoc_item_list = if let Some((first, other)) = assoc_items.split_first() {

+ let first_item = if let ast::AssocItem::Fn(func) = first

&& let Some(body) = gen_trait_fn_body(&make, func, trait_path, adt, None)

&& let Some(func_body) = func.body()

{

diff --git a/crates/ide-assists/src/handlers/unwrap_block.rs b/crates/ide-assists/src/handlers/unwrap_block.rs
index 87e61b35d8..c7e0394ce1 100644
--- a/crates/ide-assists/src/handlers/unwrap_block.rs
+++ b/crates/ide-assists/src/handlers/unwrap_block.rs

@@ -103,7 +103,7 @@ fn delete_else_before(container: SyntaxNode, edit: &mut SyntaxEditor) {

fn wrap_let(assign: &ast::LetStmt, replacement: ast::BlockExpr) -> ast::BlockExpr {

let try_wrap_assign = || {

let initializer = assign.initializer()?.syntax().syntax_element();

- let replacement = replacement.clone_subtree();

+ let (mut edit, replacement) = SyntaxEditor::with_ast_node(&replacement);

let assign = assign.clone_for_update();

let tail_expr = replacement.tail_expr()?;

let before =

@@ -115,7 +115,6 @@ fn wrap_let(assign: &ast::LetStmt, replacement: ast::BlockExpr) -> ast::BlockExp

.skip(1)

.collect();

- let (mut edit, _) = SyntaxEditor::new(replacement.syntax().clone());

edit.insert_all(Position::before(tail_expr.syntax()), before);

edit.insert_all(Position::after(tail_expr.syntax()), after);

ast::BlockExpr::cast(edit.finish().new_root().clone())

diff --git a/crates/ide-assists/src/utils.rs b/crates/ide-assists/src/utils.rs
index 01bd46406e..3de8ec7f53 100644
--- a/crates/ide-assists/src/utils.rs
+++ b/crates/ide-assists/src/utils.rs

@@ -330,10 +330,8 @@ fn invert_special_case(make: &SyntaxFactory, expr: &ast::Expr) -> Option<ast::Ex

Some(make.expr_method_call(receiver, make.name_ref(method), arg_list).into())

}

ast::Expr::PrefixExpr(pe) if pe.op_kind()? == ast::UnaryOp::Not => match pe.expr()? {

- ast::Expr::ParenExpr(parexpr) => {

- parexpr.expr().map(|e| e.clone_subtree().clone_for_update())

- }

- _ => pe.expr().map(|e| e.clone_subtree().clone_for_update()),

+ ast::Expr::ParenExpr(parexpr) => parexpr.expr(),

+ _ => pe.expr(),

ast::Expr::Literal(lit) => match lit.kind() {

ast::LiteralKind::Bool(b) => match b {

diff --git a/crates/ide-db/src/path_transform.rs b/crates/ide-db/src/path_transform.rs
index ab960a1839..407276a2de 100644
--- a/crates/ide-db/src/path_transform.rs
+++ b/crates/ide-db/src/path_transform.rs

@@ -412,19 +412,16 @@ impl Ctx<'_> {

if old.parent().is_some() {

editor.replace(old, subst.clone().syntax());

} else {

- // Some `path_ty` has no parent, especially ones made for default value

- // of type parameters.

- // In this case, `ted` cannot replace `path_ty` with `subst` directly.

- // So, just replace its children as long as the `subst` is the same type.

- let new = subst.clone_subtree().clone_for_update();

- if !matches!(new, ast::Type::PathType(..)) {

- return None;

- }

let start = path_ty.syntax().first_child().map(NodeOrToken::Node)?;

let end = path_ty.syntax().last_child().map(NodeOrToken::Node)?;

editor.replace_all(

start..=end,

- new.syntax().children().map(NodeOrToken::Node).collect::<Vec<_>>(),

+ subst

+ .clone()

+ .syntax()

+ .children()

+ .map(NodeOrToken::Node)

+ .collect::<Vec<_>>(),

);

}

} else {