Remove dyn dispatch

2 files changed, 27 insertions, 12 deletions

diff --git a/crates/libsyntax2/src/yellow/mod.rs b/crates/libsyntax2/src/yellow/mod.rs
index 82eda79d6..0596e702f 100644
--- a/crates/libsyntax2/src/yellow/mod.rs
+++ b/crates/libsyntax2/src/yellow/mod.rs
@@ -8,7 +8,7 @@ use std::{
     sync::Arc,
     ptr,
 };
-pub use self::syntax::{SyntaxNode, SyntaxNodeRef, SyntaxError};
+pub use self::syntax::{SyntaxNode, SyntaxNodeRef, SyntaxError, SyntaxNodeChildren};
 pub(crate) use self::{
     builder::GreenBuilder,
     green::GreenNode,
diff --git a/crates/libsyntax2/src/yellow/syntax.rs b/crates/libsyntax2/src/yellow/syntax.rs
index 444dbeb30..1d99cab4a 100644
--- a/crates/libsyntax2/src/yellow/syntax.rs
+++ b/crates/libsyntax2/src/yellow/syntax.rs
@@ -1,6 +1,7 @@
 use std::{
     fmt, sync::Arc,
     hash::{Hasher, Hash},
+    ops::Range,
 };
 
 use smol_str::SmolStr;
@@ -93,17 +94,11 @@ impl<R: TreeRoot> SyntaxNode<R> {
         SyntaxText::new(self.borrowed())
     }
 
-    pub fn children(&self) -> impl Iterator<Item = SyntaxNode<R>> {
-        let red = self.red;
-        let n_children = self.red().n_children();
-        let root = self.root.clone();
-        (0..n_children).map(move |i| {
-            let red = unsafe { red.get(root.syntax_root()) };
-            SyntaxNode {
-                root: root.clone(),
-                red: red.get_child(i).unwrap(),
-            }
-        })
+    pub fn children(&self) -> SyntaxNodeChildren<R> {
+        SyntaxNodeChildren {
+            parent: self.clone(),
+            iter: (0..self.red().n_children())
+        }
     }
 
     pub fn parent(&self) -> Option<SyntaxNode<R>> {
@@ -192,6 +187,26 @@ impl<R: TreeRoot> fmt::Debug for SyntaxNode<R> {
     }
 }
 
+#[derive(Debug)]
+pub struct SyntaxNodeChildren<R: TreeRoot> {
+    parent: SyntaxNode<R>,
+    iter: Range<usize>,
+}
+
+impl<R: TreeRoot> Iterator for SyntaxNodeChildren<R> {
+    type Item = SyntaxNode<R>;
+
+    fn next(&mut self) -> Option<SyntaxNode<R>> {
+        self.iter.next().map(|i| {
+            let red = self.parent.red();
+            SyntaxNode {
+                root: self.parent.root.clone(),
+                red: red.get_child(i).unwrap(),
+            }
+        })
+    }
+}
+
 fn has_short_text(kind: SyntaxKind) -> bool {
     match kind {
         IDENT | LIFETIME | INT_NUMBER | FLOAT_NUMBER => true,