From c66e5442b5b7a4cc600e0b4e4de833192f7d604d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 04:43:24 +0000 Subject: [PATCH 1/3] chore(deps): Bump toml from 0.7.8 to 0.8.0 Bumps [toml](https://github.com/toml-rs/toml) from 0.7.8 to 0.8.0. - [Commits](https://github.com/toml-rs/toml/compare/toml-v0.7.8...toml-v0.8.0) --- updated-dependencies: - dependency-name: toml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 35 ++++++++++++++++++++++++++++++----- Cargo.toml | 2 +- lib/vector-config/Cargo.toml | 2 +- lib/vector-core/Cargo.toml | 4 ++-- vdev/Cargo.toml | 2 +- 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0342f1913d9a9..112cda958afeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8820,7 +8820,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.0", ] [[package]] @@ -8845,6 +8857,19 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tonic" version = "0.9.2" @@ -9549,7 +9574,7 @@ dependencies = [ "serde_yaml 0.9.25", "sha2", "tempfile", - "toml 0.7.8", + "toml 0.8.0", ] [[package]] @@ -9725,7 +9750,7 @@ dependencies = [ "tokio-test", "tokio-tungstenite 0.20.0", "tokio-util", - "toml 0.7.8", + "toml 0.8.0", "tonic 0.10.0", "tonic-build 0.10.0", "tower", @@ -9872,7 +9897,7 @@ dependencies = [ "serde_json", "serde_with 3.3.0", "snafu", - "toml 0.7.8", + "toml 0.8.0", "tracing 0.1.37", "url", "vector-config-common", @@ -9974,7 +9999,7 @@ dependencies = [ "tokio-stream", "tokio-test", "tokio-util", - "toml 0.7.8", + "toml 0.8.0", "tonic 0.10.0", "tower", "tracing 0.1.37", diff --git a/Cargo.toml b/Cargo.toml index ad87df3fa6bf6..b3542e43fe96b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -321,7 +321,7 @@ syslog = { version = "6.1.0", default-features = false, optional = true } tikv-jemallocator = { version = "0.5.4", default-features = false, optional = true } tokio-postgres = { version = "0.7.10", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true } tokio-tungstenite = {version = "0.20.0", default-features = false, features = ["connect"], optional = true} -toml = { version = "0.7.8", default-features = false, features = ["parse", "display"] } +toml = { version = "0.8.0", default-features = false, features = ["parse", "display"] } tonic = { version = "0.10", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] } trust-dns-proto = { version = "0.23.0", default-features = false, features = ["dnssec"], optional = true } typetag = { version = "0.2.13", default-features = false } diff --git a/lib/vector-config/Cargo.toml b/lib/vector-config/Cargo.toml index fa2ccb0fa9984..50c5f8abf7801 100644 --- a/lib/vector-config/Cargo.toml +++ b/lib/vector-config/Cargo.toml @@ -22,7 +22,7 @@ serde = { version = "1.0", default-features = false } serde_json = { version = "1.0", default-features = false, features = ["std"] } serde_with = { version = "3.3.0", default-features = false, features = ["std"] } snafu = { version = "0.7.5", default-features = false } -toml = { version = "0.7.8", default-features = false } +toml = { version = "0.8.0", default-features = false } tracing = { version = "0.1.34", default-features = false } url = { version = "2.4.1", default-features = false, features = ["serde"] } http = { version = "0.2.9", default-features = false } diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index cd322b114d489..8d005ce2de5d5 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -51,7 +51,7 @@ tokio = { version = "1.32.0", default-features = false, features = ["net"] } tokio-openssl = { version = "0.6.3", default-features = false } tokio-stream = { version = "0.1", default-features = false, features = ["time"], optional = true } tokio-util = { version = "0.7.0", default-features = false, features = ["time"] } -toml = { version = "0.7.8", default-features = false } +toml = { version = "0.8.0", default-features = false } tonic = { version = "0.10", default-features = false, features = ["transport"] } tower = { version = "0.4", default-features = false, features = ["util"] } tracing = { version = "0.1.34", default-features = false } @@ -87,7 +87,7 @@ quickcheck_macros = "1" proptest = "1.2" similar-asserts = "1.5.0" tokio-test = "0.4.3" -toml = { version = "0.7.8", default-features = false, features = ["parse"] } +toml = { version = "0.8.0", default-features = false, features = ["parse"] } ndarray = "0.15.6" ndarray-stats = "0.5.1" noisy_float = "0.2.0" diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml index dd6bbf3d63c6e..9756e8c536721 100644 --- a/vdev/Cargo.toml +++ b/vdev/Cargo.toml @@ -37,4 +37,4 @@ serde_json = "1.0.106" serde_yaml = "0.9.25" sha2 = "0.10.7" tempfile = "3.6.0" -toml = { version = "0.7.8", default-features = false, features = ["parse"] } +toml = { version = "0.8.0", default-features = false, features = ["parse"] } From 15925b6c529a27794b4691df51447aff22e2c385 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Thu, 14 Sep 2023 08:37:44 +0200 Subject: [PATCH 2/3] Bump serde-toml-merge too Signed-off-by: Jesse Szwedko --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 112cda958afeb..ea5a6900ef309 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7672,11 +7672,11 @@ dependencies = [ [[package]] name = "serde-toml-merge" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78072b550e5c20bc4a9d1384be28809cbdb7b25b2b4707ddc6d908b7e6de3bf" +checksum = "250c08954c1c279a877fd44909e7c50d366082d301d23821353f8b9327baf648" dependencies = [ - "toml 0.7.8", + "toml 0.8.0", ] [[package]] From af121ac767d7c18f0a44fe60f647732e0194a6a3 Mon Sep 17 00:00:00 2001 From: Stephen Wakely Date: Thu, 14 Sep 2023 13:54:20 +0200 Subject: [PATCH 3/3] Bump serde-toml-merge in Cargo.toml Signed-off-by: Stephen Wakely --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b3542e43fe96b..742c1bfd69ce4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -201,7 +201,7 @@ tower = { version = "0.4.13", default-features = false, features = ["buffer", "l tower-http = { version = "0.4.4", default-features = false, features = ["decompression-gzip"]} # Serde serde = { version = "1.0.188", default-features = false, features = ["derive"] } -serde-toml-merge = { version = "0.3.0", default-features = false } +serde-toml-merge = { version = "0.3.2", default-features = false } serde_bytes = { version = "0.11.12", default-features = false, features = ["std"], optional = true } serde_json = { version = "1.0.106", default-features = false, features = ["raw_value"] } serde_with = { version = "3.3.0", default-features = false, features = ["macros", "std"] }