From 98277ebde897dbb071a65026399f7d1f6ab601b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20F=C3=B6rster?= Date: Mon, 1 Apr 2024 10:27:33 +0200 Subject: [PATCH] Bump logos from 0.13.0 to 0.14.0 (#1071) --- Cargo.lock | 25 ++++++++++--------------- crates/parser/Cargo.toml | 2 +- crates/parser/src/bibtex.rs | 4 ++-- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c37c0eb8..f3be6fef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -873,32 +873,33 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "logos" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c000ca4d908ff18ac99b93a062cb8958d331c3220719c52e77cb19cc6ac5d2c1" +checksum = "161971eb88a0da7ae0c333e1063467c5b5727e7fb6b710b8db4814eade3a42e8" dependencies = [ "logos-derive", ] [[package]] name = "logos-codegen" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc487311295e0002e452025d6b580b77bb17286de87b57138f3b5db711cded68" +checksum = "8e31badd9de5131fdf4921f6473d457e3dd85b11b7f091ceb50e4df7c3eeb12a" dependencies = [ "beef", "fnv", + "lazy_static", "proc-macro2", "quote", - "regex-syntax 0.6.29", + "regex-syntax", "syn", ] [[package]] name = "logos-derive" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbfc0d229f1f42d790440136d941afd806bc9e949e2bcb8faa813b0f00d1267e" +checksum = "1c2a69b3eb68d5bd595107c9ee58d7e07fe2bb5e360cc85b0f084dedac80de0a" dependencies = [ "logos-codegen", ] @@ -1253,7 +1254,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] @@ -1264,15 +1265,9 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.2" diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml index 4b8a4f61..6ba414cb 100644 --- a/crates/parser/Cargo.toml +++ b/crates/parser/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true rust-version.workspace = true [dependencies] -logos = "0.13.0" +logos = "0.14.0" once_cell = "1.19.0" regex = "1.10.4" rowan = "0.15.15" diff --git a/crates/parser/src/bibtex.rs b/crates/parser/src/bibtex.rs index fda0d4a0..e2cde27d 100644 --- a/crates/parser/src/bibtex.rs +++ b/crates/parser/src/bibtex.rs @@ -325,7 +325,7 @@ enum ValueToken { #[token("\"")] Quote, - #[regex(r"\d+", priority = 2)] + #[regex(r"\d+", priority = 3)] Integer, #[regex(r#"[^\s"\{\},#]+"#)] @@ -349,7 +349,7 @@ enum ContentToken { #[token("\"")] Quote, - #[regex(r"\d+", priority = 2)] + #[regex(r"\d+", priority = 3)] Integer, #[token(r#"~"#)]