Upgrade dependencies

Cargo.toml

@@ -1,19 +1,19 @@
 [package]
-name = "rustomaton"
-version = "0.2.1"
 authors = ["Pierre Gimalac <pierre.gimalac@gmail.com>"]
-edition = "2018"
+categories = ["algorithms"]
 description = "A small Rust library for automaton (DFA, NFA, Regex) manipulation."
-readme = "README.md"
+edition = "2018"
+exclude = ["tests"]
 homepage = "https://github.com/pgimalac/rustomaton"
-repository = "https://github.com/pgimalac/rustomaton"
-license = "MIT"
 keywords = ["automaton", "dfa", "nfa", "regex"]
-categories = ["algorithms"]
-exclude = ["tests"]
+license = "MIT"
+name = "rustomaton"
+readme = "README.md"
+repository = "https://github.com/pgimalac/rustomaton"
+version = "0.2.1"
 
 [dependencies]
-logos = "0.9.7"
+logos = "0.12.1"
 
 [dev-dependencies]
-rand = "0.7.3"
+rand = "0.8.5"

src/parser.rs

@@ -5,37 +5,34 @@ use std::collections::{BTreeSet, VecDeque};
 /// The token used by [`logos`](/logos/index.html`]).
 #[derive(Logos, Debug, PartialEq, Clone)]
 pub enum Token {
-    #[end]
-    End,
-
     #[error]
     Error,
 
-    #[token = "|"]
+    #[token("|")]
     Union,
 
-    #[token = "("]
+    #[token("(")]
     Lpar,
 
-    #[token = ")"]
+    #[token(")")]
     Rpar,
 
-    #[token = "."]
+    #[token(".")]
     Dot,
 
-    #[token = "*"]
+    #[token("*")]
     Kleene,
 
-    #[token = "?"]
+    #[token("?")]
     Question,
 
-    #[token = "+"]
+    #[token("+")]
     Plus,
 
-    #[token = "𝜀"]
+    #[token("𝜀")]
     Epsilon,
 
-    #[regex = "[^|+().*?𝜀]"]
+    #[regex("[^|+().*?𝜀]")]
     Letter,
 }
 
@@ -57,9 +54,8 @@ pub(crate) fn tokens(s: &str) -> VecDeque<(Token, &str)> {
     let mut lexer = Token::lexer(s);
     let mut tokens = VecDeque::new();
 
-    while lexer.token != Token::End {
-        tokens.push_back((lexer.token.clone(), lexer.slice()));
-        lexer.advance();
+    while let Some(token) = lexer.next() {
+        tokens.push_back((token.clone(), lexer.slice()));
     }
 
     tokens
@@ -158,7 +154,7 @@ pub(crate) fn read_concat(
                 "Unexpected {}",
                 tokens[0].1.chars().next().unwrap()
             ));
-        } else if x == Rpar || x == Union || x == End {
+        } else if x == Rpar || x == Union {
             break;
         } else {
             unreachable!()

tests/generator/mod.rs

@@ -22,7 +22,7 @@ pub fn new_generator(alphabet: HashSet<char>, max_depth: u8) -> Generator {
 impl Generator {
     fn random_with_rng(alphabet: &[char], rng: &mut ThreadRng) -> String {
         let alphalen = alphabet.len();
-        let n = rng.gen_range(0, alphalen + 2);
+        let n = rng.gen_range(0..alphalen + 2);
 
         match n.cmp(&alphalen) {
             Equal => ".".to_string(),
@@ -41,7 +41,7 @@ impl Generator {
         }
 
         const TOTAL: u8 = 7;
-        let choice = self.rng.gen_range(0, TOTAL);
+        let choice = self.rng.gen_range(0..TOTAL);
         self.actual_depth += 1;
         let rec1 = self.run();