1 files changed, 10 insertions, 9 deletions

diff --git a/src/yellow/syntax.rs b/src/yellow/syntax.rs
index 53d8c82b9..fa51e8d13 100644
--- a/src/yellow/syntax.rs
+++ b/src/yellow/syntax.rs
@@ -1,18 +1,20 @@
 use std::{
     fmt,
     sync::Arc,
+    ptr
 };
 
 use {
     TextRange, TextUnit,
     SyntaxKind::{self, *},
-    yellow::{Ptr, RedNode, GreenNode},
+    yellow::{RedNode, GreenNode},
 };
 
 #[derive(Clone)]
 pub struct SyntaxNode {
     pub(crate) root: SyntaxRoot,
-    red: Ptr<RedNode>,
+    // guaranteed to be alive bc SyntaxRoot holds a strong ref
+    red: ptr::NonNull<RedNode>,
 }
 
 #[derive(Clone)]
@@ -29,10 +31,10 @@ pub(crate) struct SyntaxError {
 
 impl SyntaxNode {
     pub(crate) fn new(root: GreenNode, errors: Vec<SyntaxError>) -> SyntaxNode {
-        let root = Arc::new(RedNode::new_root(root));
-        let red = Ptr::new(&root);
-        let root = SyntaxRoot { red: root, errors: Arc::new(errors) };
-        SyntaxNode { root, red }
+        let red = Arc::new(RedNode::new_root(root));
+        let red_weak: ptr::NonNull<RedNode> = (&*red).into();
+        let root = SyntaxRoot { red, errors: Arc::new(errors) };
+        SyntaxNode { root, red: red_weak }
     }
 
     pub fn kind(&self) -> SyntaxKind {
@@ -58,15 +60,14 @@ impl SyntaxNode {
         for i in 0..n_children {
             res.push(SyntaxNode {
                 root: self.root.clone(),
-                red: Ptr::new(&red.nth_child(Ptr::clone(&self.red), i)),
+                red: (&*red.nth_child(i)).into(),
             });
         }
         res
     }
 
     fn red(&self) -> &RedNode {
-        // Safe b/c root ptr keeps red alive
-        unsafe { self.red.get() }
+        unsafe { self.red.as_ref() }
     }
 }