Bump dependencies, remove unused nom dependency from spdlog-macros

Author: SpriteOvO

spdlog-internal/Cargo.toml

@@ -11,7 +11,7 @@ keywords = ["spdlog", "log", "logging"]
 categories = ["development-tools::debugging"]
 
 [dependencies]
-nom = "7.1.3"
-strum = { version = "0.24.1", features = ["derive"] }
-strum_macros = "0.24.3"
-thiserror = "1.0.40"
+nom = "8.0.0"
+strum = { version = "0.27.0", features = ["derive"] }
+strum_macros = "0.27.0"
+thiserror = "2.0.0"

spdlog-internal/src/pattern_parser/helper.rs

@@ -55,7 +55,7 @@ pub(crate) fn take_until_unbalanced(
 
 #[cfg(test)]
 mod tests {
-    use nom::{bytes::complete::tag, error::ErrorKind, sequence::delimited};
+    use nom::{bytes::complete::tag, error::ErrorKind, sequence::delimited, Parser};
 
     use super::*;
 
@@ -98,6 +98,9 @@ mod tests {
     #[test]
     fn take_until_basic_usage() {
         let mut parser = delimited(tag("<"), take_until_unbalanced('<', '>'), tag(">"));
-        assert_eq!(parser("<<inside>inside>abc"), Ok(("abc", "<inside>inside")));
+        assert_eq!(
+            parser.parse("<<inside>inside>abc"),
+            Ok(("abc", "<inside>inside"))
+        );
     }
 }

spdlog-internal/src/pattern_parser/parse.rs

@@ -26,14 +26,15 @@ impl<'a> Template<'a> {
 
 impl<'a> Template<'a> {
     #[must_use]
-    fn parser() -> impl Parser<&'a str, Template<'a>, NomError<&'a str>> {
+    fn parser() -> impl Parser<&'a str, Output = Template<'a>, Error = NomError<&'a str>> {
         let token_parser = TemplateToken::parser();
         nom::combinator::complete(nom::multi::many0(token_parser).and(nom::combinator::eof))
             .map(|(tokens, _)| Self { tokens })
     }
 
     #[must_use]
-    fn parser_without_style_range() -> impl Parser<&'a str, Template<'a>, NomError<&'a str>> {
+    fn parser_without_style_range(
+    ) -> impl Parser<&'a str, Output = Template<'a>, Error = NomError<&'a str>> {
         let token_parser = TemplateToken::parser_without_style_range();
         nom::combinator::complete(nom::multi::many0(token_parser).and(nom::combinator::eof))
             .map(|(tokens, _)| Self { tokens })
@@ -49,15 +50,16 @@ pub enum TemplateToken<'a> {
 
 impl<'a> TemplateToken<'a> {
     #[must_use]
-    fn parser() -> impl Parser<&'a str, TemplateToken<'a>, NomError<&'a str>> {
+    fn parser() -> impl Parser<&'a str, Output = TemplateToken<'a>, Error = NomError<&'a str>> {
         let style_range_parser = TemplateStyleRange::parser();
         let other_parser = Self::parser_without_style_range();
 
         nom::combinator::map(style_range_parser, Self::StyleRange).or(other_parser)
     }
 
     #[must_use]
-    fn parser_without_style_range() -> impl Parser<&'a str, TemplateToken<'a>, NomError<&'a str>> {
+    fn parser_without_style_range(
+    ) -> impl Parser<&'a str, Output = TemplateToken<'a>, Error = NomError<&'a str>> {
         let literal_parser = TemplateLiteral::parser();
         let formatter_parser = TemplateFormatterToken::parser();
 
@@ -73,7 +75,7 @@ pub struct TemplateLiteral {
 
 impl TemplateLiteral {
     #[must_use]
-    fn parser<'a>() -> impl Parser<&'a str, Self, NomError<&'a str>> {
+    fn parser<'a>() -> impl Parser<&'a str, Output = Self, Error = NomError<&'a str>> {
         let literal_char_parser = nom::combinator::value('{', nom::bytes::complete::tag("{{"))
             .or(nom::combinator::value('}', nom::bytes::complete::tag("}}")))
             .or(nom::character::complete::none_of("{"));
@@ -91,11 +93,12 @@ pub struct TemplateFormatterToken<'a> {
 
 impl<'a> TemplateFormatterToken<'a> {
     #[must_use]
-    fn parser() -> impl Parser<&'a str, TemplateFormatterToken<'a>, NomError<&'a str>> {
+    fn parser(
+    ) -> impl Parser<&'a str, Output = TemplateFormatterToken<'a>, Error = NomError<&'a str>> {
         let open_paren = nom::character::complete::char('{');
         let close_paren = nom::character::complete::char('}');
         let formatter_prefix = nom::character::complete::char('$');
-        let formatter_placeholder = nom::combinator::recognize(nom::sequence::tuple((
+        let formatter_placeholder = nom::combinator::recognize((
             nom::combinator::opt(formatter_prefix),
             nom::branch::alt((
                 nom::character::complete::alpha1,
@@ -105,7 +108,7 @@ impl<'a> TemplateFormatterToken<'a> {
                 nom::character::complete::alphanumeric1,
                 nom::bytes::complete::tag("_"),
             ))),
-        )));
+        ));
 
         nom::sequence::delimited(open_paren, formatter_placeholder, close_paren).map(
             move |placeholder: &str| match placeholder.strip_prefix('$') {
@@ -129,7 +132,8 @@ pub struct TemplateStyleRange<'a> {
 
 impl<'a> TemplateStyleRange<'a> {
     #[must_use]
-    fn parser() -> impl Parser<&'a str, TemplateStyleRange<'a>, NomError<&'a str>> {
+    fn parser() -> impl Parser<&'a str, Output = TemplateStyleRange<'a>, Error = NomError<&'a str>>
+    {
         nom::bytes::complete::tag("{^")
             .and(helper::take_until_unbalanced('{', '}'))
             .and(nom::bytes::complete::tag("}"))

spdlog-macros/Cargo.toml

@@ -14,7 +14,6 @@ categories = ["development-tools::debugging"]
 proc-macro = true
 
 [dependencies]
-nom = "7.1.1"
 proc-macro2 = "1.0.47"
 quote = "1.0.21"
 spdlog-internal = { version = "=0.1.0", path = "../spdlog-internal" }

spdlog/Cargo.toml

@@ -57,7 +57,7 @@ serde = { version = "1.0.163", optional = true, features = ["derive"] }
 serde_json = { version = "1.0.120", optional = true }
 spdlog-internal = { version = "=0.1.0", path = "../spdlog-internal", optional = true }
 spdlog-macros = { version = "=0.2.0", path = "../spdlog-macros" }
-thiserror = "1.0.37"
+thiserror = "2.0.0"
 value-bag = { version = "1.11.1", features = ["owned", "inline-i128"] }
 
 [target.'cfg(windows)'.dependencies]
@@ -73,7 +73,7 @@ libsystemd-sys = { version = "0.9.3", optional = true }
 android_log-sys = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
-clap = { version = "3.2.23", features = ["derive"] }
+clap = { version = "4.5.48", features = ["derive"] }
 crossbeam = "0.8.2"
 regex = "1.7.0"
 paste = "1.0.14"

spdlog/benches/spdlog-rs/compare_with_cpp_spdlog_async.rs

@@ -111,7 +111,7 @@ struct Args {
 
     /// Number of the channel capacity
     /// [default: `min(message_count + 2, 8192)`]
-    #[clap(long, validator(arg_queue_size_validator))]
+    #[clap(long, value_parser(arg_queue_size_validator))]
     queue_size: Option<usize>,
 
     /// Number of the benchmark threads