1 files changed, 32 insertions, 20 deletions

diff --git a/crates/ra_syntax/src/ast/generated.rs.tera b/crates/ra_syntax/src/ast/generated.rs.tera
index 1321f0def..131ee09ec 100644
--- a/crates/ra_syntax/src/ast/generated.rs.tera
+++ b/crates/ra_syntax/src/ast/generated.rs.tera
@@ -3,34 +3,27 @@ the below applies to the result of this template
 #}// This file is automatically generated based on the file `./generated.rs.tera` when `cargo gen-syntax` is run
 // Do not edit manually
 
+//! This module contains auto-generated Rust AST. Like `SyntaxNode`s, AST nodes
+//! are generic over ownership: `X<'a>` things are `Copy` references, `XNode`
+//! are Arc-based. You can switch between the two variants using `.owned` and
+//! `.borrowed` functions. Most of the code works with borowed mode, and only
+//! this mode has all AST accessors.
+
 #![cfg_attr(rustfmt, rustfmt_skip)]
 
+use std::hash::{Hash, Hasher};
+
 use crate::{
     ast,
     SyntaxNode, SyntaxNodeRef, AstNode,
+    yellow::{TreeRoot, RaTypes, OwnedRoot, RefRoot},
     SyntaxKind::*,
 };
 {% for node, methods in ast %}
 // {{ node }}
 
-#[derive(Debug, Clone)]
-pub struct {{ node }}Node(SyntaxNode);
-
-impl {{ node }}Node {
-    pub fn ast(&self) -> {{ node }} {
-        {{ node }}::cast(self.0.borrowed()).unwrap()
-    }
-}
-
-impl<'a> From<{{ node }}<'a>> for {{ node }}Node {
-    fn from(ast: {{ node}}<'a>) -> {{ node }}Node {
-        let syntax = ast.syntax().owned();
-        {{ node }}Node(syntax)
-    }
-}
-
 {%- if methods.enum %}
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum {{ node }}<'a> {
 {%- for kind in methods.enum %}
     {{ kind }}({{ kind }}<'a>),
@@ -55,9 +48,18 @@ impl<'a> AstNode<'a> for {{ node }}<'a> {
     }
 }
 {% else %}
-#[derive(Debug, Clone, Copy)]
-pub struct {{ node }}<'a> {
-    syntax: SyntaxNodeRef<'a>,
+#[derive(Debug, Clone, Copy,)]
+pub struct {{ node }}Node<R: TreeRoot<RaTypes> = OwnedRoot> {
+    pub(crate) syntax: SyntaxNode<R>,
+}
+pub type {{ node }}<'a> = {{ node }}Node<RefRoot<'a>>;
+
+impl<R1: TreeRoot<RaTypes>, R2: TreeRoot<RaTypes>> PartialEq<{{node}}Node<R1>> for {{node}}Node<R2> {
+    fn eq(&self, other: &{{node}}Node<R1>) -> bool { self.syntax == other.syntax }
+}
+impl<R: TreeRoot<RaTypes>> Eq for {{node}}Node<R> {}
+impl<R: TreeRoot<RaTypes>> Hash for {{node}}Node<R> {
+    fn hash<H: Hasher>(&self, state: &mut H) { self.syntax.hash(state) }
 }
 
 impl<'a> AstNode<'a> for {{ node }}<'a> {
@@ -69,6 +71,16 @@ impl<'a> AstNode<'a> for {{ node }}<'a> {
     }
     fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
 }
+
+impl<R: TreeRoot<RaTypes>> {{ node }}Node<R> {
+    pub fn borrowed(&self) -> {{ node }} {
+        {{ node }}Node { syntax: self.syntax.borrowed() }
+    }
+    pub fn owned(&self) -> {{ node }}Node {
+        {{ node }}Node { syntax: self.syntax.owned() }
+    }
+}
+
 {% endif %}
 {% if methods.traits -%}
 {%- for t in methods.traits -%}