Move SyntaxKind into green, where it belongs

Author: matklad

examples/math.rs

@@ -34,7 +34,7 @@ enum SyntaxKind {
 }
 use SyntaxKind::*;
 
-impl From<SyntaxKind> for rowan::cursor::SyntaxKind {
+impl From<SyntaxKind> for rowan::SyntaxKind {
     fn from(kind: SyntaxKind) -> Self {
         Self(kind as u16)
     }
@@ -44,11 +44,11 @@ impl From<SyntaxKind> for rowan::cursor::SyntaxKind {
 enum Lang {}
 impl rowan::Language for Lang {
     type Kind = SyntaxKind;
-    fn kind_from_raw(raw: rowan::cursor::SyntaxKind) -> Self::Kind {
+    fn kind_from_raw(raw: rowan::SyntaxKind) -> Self::Kind {
         assert!(raw.0 <= ROOT as u16);
         unsafe { std::mem::transmute::<u16, SyntaxKind>(raw.0) }
     }
-    fn kind_to_raw(kind: Self::Kind) -> rowan::cursor::SyntaxKind {
+    fn kind_to_raw(kind: Self::Kind) -> rowan::SyntaxKind {
         kind.into()
     }
 }

examples/s_expressions.rs

@@ -31,7 +31,7 @@ enum SyntaxKind {
 }
 use SyntaxKind::*;
 
-impl From<SyntaxKind> for rowan::cursor::SyntaxKind {
+impl From<SyntaxKind> for rowan::SyntaxKind {
     fn from(kind: SyntaxKind) -> Self {
         Self(kind as u16)
     }
@@ -41,11 +41,11 @@ impl From<SyntaxKind> for rowan::cursor::SyntaxKind {
 enum Lang {}
 impl rowan::Language for Lang {
     type Kind = SyntaxKind;
-    fn kind_from_raw(raw: rowan::cursor::SyntaxKind) -> Self::Kind {
+    fn kind_from_raw(raw: rowan::SyntaxKind) -> Self::Kind {
         assert!(raw.0 <= ROOT as u16);
         unsafe { std::mem::transmute::<u16, SyntaxKind>(raw.0) }
     }
-    fn kind_to_raw(kind: Self::Kind) -> rowan::cursor::SyntaxKind {
+    fn kind_to_raw(kind: Self::Kind) -> rowan::SyntaxKind {
         kind.into()
     }
 }
@@ -368,7 +368,7 @@ nan
 
 fn lex(text: &str) -> Vec<(SyntaxKind, SmolStr)> {
     fn tok(t: SyntaxKind) -> m_lexer::TokenKind {
-        m_lexer::TokenKind(rowan::cursor::SyntaxKind::from(t).0)
+        m_lexer::TokenKind(rowan::SyntaxKind::from(t).0)
     }
     fn kind(t: m_lexer::TokenKind) -> SyntaxKind {
         match t.0 {

src/api.rs

@@ -1,15 +1,15 @@
 use std::{fmt, marker::PhantomData};
 
 use crate::{
-    cursor, Direction, GreenNode, GreenToken, NodeOrToken, SmolStr, SyntaxText, TextRange,
-    TextUnit, TokenAtOffset, WalkEvent,
+    cursor, Direction, GreenNode, GreenToken, NodeOrToken, SmolStr, SyntaxKind, SyntaxText,
+    TextRange, TextUnit, TokenAtOffset, WalkEvent,
 };
 
 pub trait Language: Sized + Clone + Copy + fmt::Debug + Eq + Ord + std::hash::Hash {
     type Kind: fmt::Debug;
 
-    fn kind_from_raw(raw: cursor::SyntaxKind) -> Self::Kind;
-    fn kind_to_raw(kind: Self::Kind) -> cursor::SyntaxKind;
+    fn kind_from_raw(raw: SyntaxKind) -> Self::Kind;
+    fn kind_to_raw(kind: Self::Kind) -> SyntaxKind;
 }
 
 #[derive(Clone, PartialEq, Eq, Hash)]

src/cursor.rs

@@ -7,14 +7,11 @@ use std::{
 };
 
 use crate::{
-    green::GreenElementRef, Children, Direction, GreenNode, GreenToken, NodeOrToken, SmolStr,
-    SyntaxText, TextRange, TextUnit, TokenAtOffset, WalkEvent,
+    green::{GreenElementRef, SyntaxKind},
+    Children, Direction, GreenNode, GreenToken, NodeOrToken, SmolStr, SyntaxText, TextRange,
+    TextUnit, TokenAtOffset, WalkEvent,
 };
 
-/// SyntaxKind is a type tag for each token or node.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct SyntaxKind(pub u16);
-
 #[derive(Debug, Clone)]
 pub struct SyntaxNode(Rc<NodeData>);
 
@@ -24,6 +21,7 @@ impl Drop for SyntaxNode {
     }
 }
 
+// Identity semantics for hash & eq
 impl PartialEq for SyntaxNode {
     fn eq(&self, other: &SyntaxNode) -> bool {
         ptr::eq(self.green(), other.green())
@@ -64,7 +62,7 @@ impl fmt::Display for SyntaxToken {
     }
 }
 
-pub(crate) type SyntaxElement = NodeOrToken<SyntaxNode, SyntaxToken>;
+pub type SyntaxElement = NodeOrToken<SyntaxNode, SyntaxToken>;
 
 impl From<SyntaxNode> for SyntaxElement {
     fn from(node: SyntaxNode) -> SyntaxElement {

src/green.rs

@@ -12,6 +12,10 @@ pub use self::{
     token::GreenToken,
 };
 
+/// SyntaxKind is a type tag for each token or node.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct SyntaxKind(pub u16);
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/green/builder.rs

@@ -1,8 +1,7 @@
 use rustc_hash::FxHashSet;
 
 use crate::{
-    cursor::SyntaxKind,
-    green::{GreenElement, GreenNode, GreenToken},
+    green::{GreenElement, GreenNode, GreenToken, SyntaxKind},
     NodeOrToken, SmolStr,
 };
 
@@ -135,7 +134,7 @@ impl GreenNodeBuilder<'_> {
     /// `start_node_at`.
     /// Example:
     /// ```rust
-    /// # use rowan::{GreenNodeBuilder, cursor::SyntaxKind};
+    /// # use rowan::{GreenNodeBuilder, SyntaxKind};
     /// # const PLUS: SyntaxKind = SyntaxKind(0);
     /// # const OPERATION: SyntaxKind = SyntaxKind(1);
     /// # struct Parser;

src/green/element.rs

@@ -3,8 +3,7 @@ use std::{fmt, hash, mem};
 use thin_dst::ErasedPtr;
 
 use crate::{
-    cursor::SyntaxKind,
-    green::{GreenNode, GreenToken},
+    green::{GreenNode, GreenToken, SyntaxKind},
     NodeOrToken, TextUnit,
 };
 

src/green/node.rs

@@ -3,8 +3,7 @@ use std::{iter::FusedIterator, slice, sync::Arc};
 use thin_dst::{ThinArc, ThinData};
 
 use crate::{
-    cursor::SyntaxKind,
-    green::{GreenElement, GreenElementRef, PackedGreenElement},
+    green::{GreenElement, GreenElementRef, PackedGreenElement, SyntaxKind},
     TextUnit,
 };
 

src/green/token.rs

@@ -1,6 +1,6 @@
 use std::{fmt, hash, mem::ManuallyDrop, ptr, sync::Arc};
 
-use crate::{cursor::SyntaxKind, SmolStr, TextUnit};
+use crate::{green::SyntaxKind, SmolStr, TextUnit};
 
 #[repr(align(2))] // NB: this is an at-least annotation
 #[derive(Debug, PartialEq, Eq, Hash)]

src/lib.rs

@@ -29,7 +29,7 @@ pub use crate::{
     api::{
         Language, SyntaxElement, SyntaxElementChildren, SyntaxNode, SyntaxNodeChildren, SyntaxToken,
     },
-    green::{Checkpoint, Children, GreenNode, GreenNodeBuilder, GreenToken},
+    green::{Checkpoint, Children, GreenNode, GreenNodeBuilder, GreenToken, SyntaxKind},
     syntax_text::SyntaxText,
     utility_types::{Direction, NodeOrToken, TokenAtOffset, WalkEvent},
 };