From ed3a746013571062e3ffa087f35cfe2c6848802b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 2 Feb 2025 15:49:34 +0000 Subject: [PATCH 1/2] Update nom requirement from 7 to 8 in the dependencies group Updates the requirements on [nom](https://github.com/rust-bakery/nom) to permit the latest version. Updates `nom` to 8.0.0 - [Changelog](https://github.com/rust-bakery/nom/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-bakery/nom/compare/7.0.0...8.0.0) --- updated-dependencies: - dependency-name: nom dependency-type: direct:production dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- concatsql_macro/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concatsql_macro/Cargo.toml b/concatsql_macro/Cargo.toml index b36acdd..848f48e 100644 --- a/concatsql_macro/Cargo.toml +++ b/concatsql_macro/Cargo.toml @@ -18,7 +18,7 @@ proc-macro2 = "1.0" proc-macro-error = "1.0" syn = { version = "2.0", features = ["full", "extra-traits"] } quote = "1.0" -nom = "7" +nom = "8" [dev-dependencies] concatsql = { version = "0.5", path = "../concatsql" } From 37acf14fa572acc461500d4fb854cedfc5618d75 Mon Sep 17 00:00:00 2001 From: kumavale Date: Sun, 23 Feb 2025 10:41:53 +0900 Subject: [PATCH 2/2] refactor: Refactoring due to nom version upgrade https://github.com/rust-bakery/nom/blob/main/CHANGELOG.md#800-2025-01-25 --- concatsql_macro/Cargo.toml | 2 +- concatsql_macro/src/lib.rs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/concatsql_macro/Cargo.toml b/concatsql_macro/Cargo.toml index 848f48e..59d2dee 100644 --- a/concatsql_macro/Cargo.toml +++ b/concatsql_macro/Cargo.toml @@ -18,7 +18,7 @@ proc-macro2 = "1.0" proc-macro-error = "1.0" syn = { version = "2.0", features = ["full", "extra-traits"] } quote = "1.0" -nom = "8" +nom = "8.0.0" [dev-dependencies] concatsql = { version = "0.5", path = "../concatsql" } diff --git a/concatsql_macro/src/lib.rs b/concatsql_macro/src/lib.rs index b871b7c..e46e520 100644 --- a/concatsql_macro/src/lib.rs +++ b/concatsql_macro/src/lib.rs @@ -5,7 +5,7 @@ use nom::{ bytes::complete::tag, character::complete::{char, none_of}, multi::{many0, many1}, - IResult, + IResult, Parser, }; use proc_macro::TokenStream; use proc_macro2::{Ident, Span}; @@ -68,17 +68,18 @@ impl FormatParser { FormatParser::brace_close, FormatParser::param, FormatParser::lit, - )))(input) + ))) + .parse(input) } fn lit(input: &str) -> IResult<&str, Query> { - let (input, lit) = many1(none_of("{}"))(input)?; + let (input, lit) = many1(none_of("{}")).parse(input)?; Ok((input, Query::Lit(lit.into_iter().collect()))) } fn param(input: &str) -> IResult<&str, Query> { let (input, _) = char('{')(input)?; - let (input, param) = many1(none_of("}"))(input)?; + let (input, param) = many1(none_of("}")).parse(input)?; let (input, _) = char('}')(input)?; let param = param.into_iter().collect::(); Ok((input, Query::Param(param.trim().to_string())))