Merge #1716

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



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

2 files changed, 15 insertions, 4 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
 }
 
diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs
index afdfca66e..a2f862869 100644
--- a/crates/ra_syntax/src/ast.rs
+++ b/crates/ra_syntax/src/ast.rs
@@ -25,15 +25,23 @@ pub use self::{
 /// conversion itself has zero runtime cost: ast and syntax nodes have exactly
 /// the same representation: a pointer to the tree root and a pointer to the
 /// node itself.
-pub trait AstNode: Clone {
-    fn can_cast(kind: SyntaxKind) -> bool;
+pub trait AstNode {
+    fn can_cast(kind: SyntaxKind) -> bool
+    where
+        Self: Sized;
 
     fn cast(syntax: SyntaxNode) -> Option<Self>
     where
         Self: Sized;
+
     fn syntax(&self) -> &SyntaxNode;
 }
 
+#[test]
+fn assert_ast_is_object_safe() {
+    fn _f(_: &dyn AstNode, _: &dyn NameOwner) {}
+}
+
 /// Like `AstNode`, but wraps tokens rather than interior nodes.
 pub trait AstToken {
     fn cast(token: SyntaxToken) -> Option<Self>