Merge #3375

3375: Cleanup editing API a bit r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 6 insertions, 7 deletions

diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index 0e78d8b63..d2630e9e9 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/ra_syntax/src/ast/edit.rs
@@ -276,7 +276,7 @@ pub fn replace_descendants<N: AstNode, D: AstNode>(
         .into_iter()
         .map(|(from, to)| (from.syntax().clone().into(), to.syntax().clone().into()))
         .collect::<FxHashMap<SyntaxElement, _>>();
-    let new_syntax = algo::replace_descendants(parent.syntax(), &|n| map.get(n).cloned());
+    let new_syntax = algo::replace_descendants(parent.syntax(), |n| map.get(n).cloned());
     N::cast(new_syntax).unwrap()
 }
 
@@ -331,7 +331,7 @@ impl IndentLevel {
                 )
             })
             .collect();
-        algo::replace_descendants(&node, &|n| replacements.get(n).cloned())
+        algo::replace_descendants(&node, |n| replacements.get(n).cloned())
     }
 
     pub fn decrease_indent<N: AstNode>(self, node: N) -> N {
@@ -359,7 +359,7 @@ impl IndentLevel {
                 )
             })
             .collect();
-        algo::replace_descendants(&node, &|n| replacements.get(n).cloned())
+        algo::replace_descendants(&node, |n| replacements.get(n).cloned())
     }
 }
 
@@ -389,7 +389,7 @@ fn insert_children<N: AstNode>(
     position: InsertPosition<SyntaxElement>,
     to_insert: impl IntoIterator<Item = SyntaxElement>,
 ) -> N {
-    let new_syntax = algo::insert_children(parent.syntax(), position, &mut to_insert.into_iter());
+    let new_syntax = algo::insert_children(parent.syntax(), position, to_insert);
     N::cast(new_syntax).unwrap()
 }
 
@@ -404,8 +404,7 @@ fn replace_children<N: AstNode>(
     to_replace: RangeInclusive<SyntaxElement>,
     to_insert: impl IntoIterator<Item = SyntaxElement>,
 ) -> N {
-    let new_syntax =
-        algo::replace_children(parent.syntax(), to_replace, &mut to_insert.into_iter());
+    let new_syntax = algo::replace_children(parent.syntax(), to_replace, to_insert);
     N::cast(new_syntax).unwrap()
 }
 
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
index 60cd9d260..3f11b747f 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -15,7 +15,7 @@ pub fn name_ref(text: &str) -> ast::NameRef {
 pub fn path_segment(name_ref: ast::NameRef) -> ast::PathSegment {
     ast_from_text(&format!("use {};", name_ref.syntax()))
 }
-pub fn path_unqalified(segment: ast::PathSegment) -> ast::Path {
+pub fn path_unqualified(segment: ast::PathSegment) -> ast::Path {
     path_from_text(&format!("use {}", segment.syntax()))
 }
 pub fn path_qualified(qual: ast::Path, segment: ast::PathSegment) -> ast::Path {