From 923609add7266c66475fb68ea58bb4f7862b16db Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 16:33:58 +0300 Subject: [PATCH] chore(deps): update rust crates syn to v2, darling to 0.20.1 (#66) * chore(deps): update rust crate syn to v2 * update syn and darling together --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Valery Antopol --- Cargo.lock | 57 +++++++++++++++---- crates/marine-test-macro-impl/Cargo.toml | 4 +- .../marine-test-macro-impl/src/attributes.rs | 4 +- .../src/marine_test/marine_test_impl.rs | 6 +- crates/marine-test-macro/Cargo.toml | 2 +- 5 files changed, 56 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cbe9311..8b372f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -413,8 +413,18 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +dependencies = [ + "darling_core 0.20.1", + "darling_macro 0.20.1", ] [[package]] @@ -431,17 +441,42 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.15", +] + [[package]] name = "darling_macro" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core", + "darling_core 0.14.4", "quote", "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +dependencies = [ + "darling_core 0.20.1", + "quote", + "syn 2.0.15", +] + [[package]] name = "digest" version = "0.10.6" @@ -1189,14 +1224,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "marine-test-macro-impl" version = "0.9.1" dependencies = [ - "darling", + "darling 0.20.1", "fluence-app-service", "itertools", "marine-it-parser", @@ -1205,7 +1240,7 @@ dependencies = [ "proc-macro2", "quote", "static_assertions", - "syn 1.0.109", + "syn 2.0.15", "thiserror", ] @@ -1649,7 +1684,7 @@ checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -1685,7 +1720,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e" dependencies = [ - "darling", + "darling 0.14.4", "proc-macro2", "quote", "syn 1.0.109", @@ -1754,9 +1789,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.14" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -1811,7 +1846,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] diff --git a/crates/marine-test-macro-impl/Cargo.toml b/crates/marine-test-macro-impl/Cargo.toml index ba2bf2f..e4024d3 100644 --- a/crates/marine-test-macro-impl/Cargo.toml +++ b/crates/marine-test-macro-impl/Cargo.toml @@ -17,11 +17,11 @@ all-features = true fluence-app-service = { version = "0.25.3", features = ["raw-module-api"] } marine-it-parser = "0.12.1" itertools = "0.10.5" -darling = "0.14.4" +darling = "0.20.1" quote = "1.0.26" proc-macro2 = "1.0.56" proc-macro-error = { version = "1.0.4", default-features = false } -syn = { version = '1.0.109', features = ['full'] } +syn = { version = '2.0.15', features = ['full'] } thiserror = "1.0.40" static_assertions = "1.1.0" diff --git a/crates/marine-test-macro-impl/src/attributes.rs b/crates/marine-test-macro-impl/src/attributes.rs index 3ef993d..e0f5990 100644 --- a/crates/marine-test-macro-impl/src/attributes.rs +++ b/crates/marine-test-macro-impl/src/attributes.rs @@ -15,6 +15,8 @@ */ use darling::FromMeta; +use darling::ast::NestedMeta; + use std::collections::HashMap; /// Describes attributes of `marine_test` macro. @@ -35,7 +37,7 @@ pub struct ServiceDescription { } impl FromMeta for MTestAttributes { - fn from_list(items: &[syn::NestedMeta]) -> darling::Result { + fn from_list(items: &[NestedMeta]) -> darling::Result { let single_service = ServiceDescription::from_list(items); let multiple_services = HashMap::::from_list(items); match (single_service, multiple_services) { diff --git a/crates/marine-test-macro-impl/src/marine_test/marine_test_impl.rs b/crates/marine-test-macro-impl/src/marine_test/marine_test_impl.rs index c81aff9..3e7f0bf 100644 --- a/crates/marine-test-macro-impl/src/marine_test/marine_test_impl.rs +++ b/crates/marine-test-macro-impl/src/marine_test/marine_test_impl.rs @@ -21,7 +21,9 @@ use crate::marine_test::glue_code_generator::generate_marine_test_env_for_build_ use proc_macro2::TokenStream; use darling::FromMeta; +use darling::ast::NestedMeta; use syn::parse::Parser; + use std::path::{PathBuf, Path}; pub fn marine_test_impl( @@ -30,9 +32,9 @@ pub fn marine_test_impl( file_path: PathBuf, ) -> TResult { // from https://github.com/dtolnay/syn/issues/788 - let parser = syn::punctuated::Punctuated::::parse_terminated; + let parser = syn::punctuated::Punctuated::::parse_terminated; let attrs = parser.parse2(attrs)?; - let attrs: Vec = attrs.into_iter().collect(); + let attrs: Vec = attrs.into_iter().collect(); let attrs = MTestAttributes::from_list(&attrs)?; let item = syn::parse2::(input)?; diff --git a/crates/marine-test-macro/Cargo.toml b/crates/marine-test-macro/Cargo.toml index fb8c6e7..74e6c52 100644 --- a/crates/marine-test-macro/Cargo.toml +++ b/crates/marine-test-macro/Cargo.toml @@ -23,4 +23,4 @@ marine-test-macro-impl = { path = "../marine-test-macro-impl", version = "=0.9.1 quote = "1.0.26" proc-macro2 = "1.0.56" proc-macro-error = { version = "1.0.4", default-features = false } -syn = { version = '1.0.109', features = ['full'] } +syn = { version = '2.0.15', features = ['full'] }