diff --git a/Cargo.lock b/Cargo.lock index ce9e6d92c79c3..3b74d49cc084d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -574,7 +574,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -596,7 +596,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -613,7 +613,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -1551,7 +1551,7 @@ checksum = "602bda35f33aeb571cef387dcd4042c643a8bf689d8aaac2cc47ea24cb7bc7e0" dependencies = [ "chrono", "serde", - "serde_with 2.3.2", + "serde_with 2.3.3", ] [[package]] @@ -1975,7 +1975,7 @@ dependencies = [ "heck 0.4.0", "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -2514,6 +2514,16 @@ dependencies = [ "darling_macro 0.14.2", ] +[[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]] name = "darling_core" version = "0.13.4" @@ -2542,6 +2552,20 @@ 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 1.0.60", + "quote 1.0.28", + "strsim 0.10.0", + "syn 2.0.18", +] + [[package]] name = "darling_macro" version = "0.13.4" @@ -2564,6 +2588,17 @@ dependencies = [ "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 1.0.28", + "syn 2.0.18", +] + [[package]] name = "dashmap" version = "5.4.0" @@ -2960,7 +2995,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -3347,7 +3382,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -4906,7 +4941,7 @@ checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -5435,7 +5470,7 @@ dependencies = [ "proc-macro-crate 1.2.1", "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -5932,7 +5967,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -7335,7 +7370,7 @@ checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -7434,9 +7469,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ "base64 0.13.1", "chrono", @@ -7444,7 +7479,22 @@ dependencies = [ "indexmap", "serde", "serde_json", - "serde_with_macros 2.3.2", + "time", +] + +[[package]] +name = "serde_with" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" +dependencies = [ + "base64 0.21.2", + "chrono", + "hex", + "indexmap", + "serde", + "serde_json", + "serde_with_macros 3.0.0", "time", ] @@ -7462,14 +7512,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.3.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c" +checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" dependencies = [ - "darling 0.14.2", + "darling 0.20.1", "proc-macro2 1.0.60", "quote 1.0.28", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -7934,9 +7984,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.10" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", @@ -8111,7 +8161,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -8256,7 +8306,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -8882,7 +8932,7 @@ checksum = "2c3e1c30cedd24fc597f7d37a721efdbdc2b1acae012c1ef1218f4c7c2c0f3e7" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", ] [[package]] @@ -9234,7 +9284,7 @@ dependencies = [ "serde-toml-merge", "serde_bytes", "serde_json", - "serde_with 2.3.2", + "serde_with 3.0.0", "serde_yaml 0.9.21", "sha2 0.10.6", "similar-asserts", @@ -9402,7 +9452,7 @@ dependencies = [ "once_cell", "serde", "serde_json", - "serde_with 2.3.2", + "serde_with 3.0.0", "snafu", "toml 0.7.4", "tracing 0.1.37", @@ -9495,7 +9545,7 @@ dependencies = [ "security-framework", "serde", "serde_json", - "serde_with 2.3.2", + "serde_with 3.0.0", "similar-asserts", "smallvec", "snafu", @@ -9802,7 +9852,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", "wasm-bindgen-shared", ] @@ -9836,7 +9886,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2 1.0.60", "quote 1.0.28", - "syn 2.0.10", + "syn 2.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index de6bdc4cb2552..700c1be483b53 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -191,7 +191,7 @@ serde = { version = "1.0.164", default-features = false, features = ["derive"] } serde-toml-merge = { version = "0.3.0", default-features = false } serde_bytes = { version = "0.11.9", default-features = false, features = ["std"], optional = true } serde_json = { version = "1.0.96", default-features = false, features = ["raw_value"] } -serde_with = { version = "2.3.2", default-features = false, features = ["macros", "std"] } +serde_with = { version = "3.0.0", default-features = false, features = ["macros", "std"] } serde_yaml = { version = "0.9.21", default-features = false } # Messagepack diff --git a/lib/vector-config/Cargo.toml b/lib/vector-config/Cargo.toml index bae87581cc42f..33d2e4d90e4e3 100644 --- a/lib/vector-config/Cargo.toml +++ b/lib/vector-config/Cargo.toml @@ -21,7 +21,7 @@ num-traits = { version = "0.2.15", default-features = false } once_cell = { version = "1", default-features = false } serde = { version = "1.0", default-features = false } serde_json = { version = "1.0", default-features = false, features = ["std"] } -serde_with = { version = "2.3.2", default-features = false, features = ["std"] } +serde_with = { version = "3.0.0", default-features = false, features = ["std"] } snafu = { version = "0.7.4", default-features = false } toml = { version = "0.7.4", default-features = false } tracing = { version = "0.1.34", default-features = false } @@ -32,4 +32,4 @@ vector-config-macros = { path = "../vector-config-macros" } [dev-dependencies] assert-json-diff = { version = "2", default-features = false } -serde_with = { version = "2.3.2", default-features = false, features = ["std", "macros"] } +serde_with = { version = "3.0.0", default-features = false, features = ["std", "macros"] } diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index d4e997eecdd05..089a6e98b3fea 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -42,7 +42,7 @@ regex = { version = "1.8.4", default-features = false, features = ["std", "perf" ryu = { version = "1", default-features = false } serde = { version = "1.0.164", default-features = false, features = ["derive", "rc"] } serde_json = { version = "1.0.96", default-features = false } -serde_with = { version = "2.3.2", default-features = false, features = ["std", "macros"] } +serde_with = { version = "3.0.0", default-features = false, features = ["std", "macros"] } smallvec = { version = "1", default-features = false, features = ["serde", "const_generics"] } snafu = { version = "0.7.4", default-features = false } socket2 = { version = "0.5.3", default-features = false }