Merge #1716

1716: make ast object safe r=matklad a=matklad



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

1 files changed, 5 insertions, 2 deletions

diff --git a/crates/ra_assists/src/ast_editor.rs b/crates/ra_assists/src/ast_editor.rs
index 5b6952426..076df98f2 100644
--- a/crates/ra_assists/src/ast_editor.rs
+++ b/crates/ra_assists/src/ast_editor.rs
@@ -19,7 +19,10 @@ pub struct AstEditor<N: AstNode> {
 }
 
 impl<N: AstNode> AstEditor<N> {
-    pub fn new(node: N) -> AstEditor<N> {
+    pub fn new(node: N) -> AstEditor<N>
+    where
+        N: Clone,
+    {
         AstEditor { original_ast: node.clone(), ast: node }
     }
 
@@ -379,7 +382,7 @@ impl AstBuilder<ast::MatchArmList> {
 
 fn ast_node_from_file_text<N: AstNode>(text: &str) -> N {
     let parse = SourceFile::parse(text);
-    let res = parse.tree().syntax().descendants().find_map(N::cast).unwrap().to_owned();
+    let res = parse.tree().syntax().descendants().find_map(N::cast).unwrap();
     res
 }