Bump logos, rowan

Author: sethdusek

ergoscript-compiler/Cargo.toml

@@ -18,9 +18,9 @@ ergotree-ir = { workspace = true }
 derive_more = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
-logos = "0.12"
+logos = "0.15.1"
 text-size = "1.1.0"
-rowan = "0.12.1"
+rowan = "0.16.1"
 drop_bomb = "0.1.5"
 line-col = "0.2.1"
 

ergoscript-compiler/src/lexer.rs

@@ -24,7 +24,7 @@ impl<'a> Iterator for Lexer<'a> {
     type Item = Token<'a>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        let kind = self.inner.next()?;
+        let kind = self.inner.next()?.ok()?;
         let text = self.inner.slice();
 
         let range = {

ergoscript-compiler/src/lexer/token_kind.rs

@@ -55,9 +55,6 @@ pub enum TokenKind {
 
     #[regex("//.*")]
     Comment,
-
-    #[error]
-    Error,
 }
 
 impl TokenKind {
@@ -86,7 +83,6 @@ impl fmt::Display for TokenKind {
             Self::LBrace => "‘{’",
             Self::RBrace => "‘}’",
             Self::Comment => "comment",
-            Self::Error => "an unrecognized token",
         })
     }
 }

ergoscript-compiler/src/syntax.rs

@@ -4,7 +4,7 @@ use super::lexer::TokenKind;
 use num_derive::{FromPrimitive, ToPrimitive};
 use num_traits::{FromPrimitive, ToPrimitive};
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, FromPrimitive, ToPrimitive)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, FromPrimitive, ToPrimitive, Hash, PartialOrd, Ord)]
 pub enum SyntaxKind {
     Whitespace,
     FnKw,
@@ -50,7 +50,6 @@ impl From<TokenKind> for SyntaxKind {
             TokenKind::LBrace => Self::LBrace,
             TokenKind::RBrace => Self::RBrace,
             TokenKind::Comment => Self::Comment,
-            TokenKind::Error => Self::Error,
             TokenKind::And => Self::And,
         }
     }