From 5c1c6c29d2ab1919a27cc95d6687b336026493b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 18:39:02 +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 | 37 ++++++++++++++++++++---- src/bench/Cargo.toml | 2 +- src/common/Cargo.toml | 2 +- src/tests/state_cleaning_test/Cargo.toml | 2 +- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a882bd21a360..56acc57f01b29 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5797,7 +5797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -6549,7 +6549,7 @@ dependencies = [ "risingwave_storage", "serde", "tokio-stream", - "toml 0.7.8", + "toml 0.8.0", "tracing", "tracing-subscriber", "workspace-hack", @@ -6686,7 +6686,7 @@ dependencies = [ "tempfile", "thiserror", "tinyvec", - "toml 0.7.8", + "toml 0.8.0", "tower-layer", "tower-service", "tracing", @@ -7512,7 +7512,7 @@ dependencies = [ "serde_with 3.3.0", "tokio-postgres", "tokio-stream", - "toml 0.7.8", + "toml 0.8.0", "tracing", "workspace-hack", ] @@ -9197,7 +9197,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]] @@ -9222,6 +9234,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" @@ -10112,7 +10137,7 @@ dependencies = [ "tokio-stream", "tokio-util", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", "tonic", "tower", "tracing", diff --git a/src/bench/Cargo.toml b/src/bench/Cargo.toml index d3c74e385a4fe..31b8f5ce7cc94 100644 --- a/src/bench/Cargo.toml +++ b/src/bench/Cargo.toml @@ -38,7 +38,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [ "signal", ] } tokio-stream = "0.1" -toml = "0.7" +toml = "0.8" tracing = "0.1" tracing-subscriber = "0.3.17" diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index 5484b2b88c412..10a48ebc77555 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -93,7 +93,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [ "time", "signal", ] } -toml = "0.7" +toml = "0.8" tonic = { workspace = true } tracing = "0.1" tracing-opentelemetry = "0.21" diff --git a/src/tests/state_cleaning_test/Cargo.toml b/src/tests/state_cleaning_test/Cargo.toml index 2116e1d58659a..d9154309f4a99 100644 --- a/src/tests/state_cleaning_test/Cargo.toml +++ b/src/tests/state_cleaning_test/Cargo.toml @@ -25,7 +25,7 @@ serde_with = "3" tokio = { version = "0.2", package = "madsim-tokio" } tokio-postgres = "0.7" tokio-stream = { version = "0.1", features = ["fs"] } -toml = "0.7" +toml = "0.8" tracing = "0.1" [target.'cfg(not(madsim))'.dependencies] From 437084fdbce16b4107f9ea244885b74e570c9bb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 14 Sep 2023 18:40:14 +0000 Subject: [PATCH 2/3] Fix "cargo-hakari" --- Cargo.lock | 1 - src/workspace-hack/Cargo.toml | 2 -- 2 files changed, 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 56acc57f01b29..156ddc082ee83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10137,7 +10137,6 @@ dependencies = [ "tokio-stream", "tokio-util", "toml_datetime", - "toml_edit 0.19.15", "tonic", "tower", "tracing", diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index a539527690fce..7910ba3fc1124 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -101,7 +101,6 @@ tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e", features = ["fs", "net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } -toml_edit = { version = "0.19", features = ["serde"] } tonic = { version = "0.9", features = ["gzip", "tls-webpki-roots"] } tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] } tracing = { version = "0.1", features = ["log"] } @@ -203,7 +202,6 @@ tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e", features = ["fs", "net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } -toml_edit = { version = "0.19", features = ["serde"] } tonic = { version = "0.9", features = ["gzip", "tls-webpki-roots"] } tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] } tracing = { version = "0.1", features = ["log"] } From d8c3a28399c4fd97d6ab514f709a9da71d191d8b Mon Sep 17 00:00:00 2001 From: wangrunji0408 Date: Sat, 7 Oct 2023 13:53:41 +0000 Subject: [PATCH 3/3] Fix "cargo-hakari" --- Cargo.lock | 1 + src/workspace-hack/Cargo.toml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55c76030e8853..c03de9378aaaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10924,6 +10924,7 @@ dependencies = [ "tokio-stream", "tokio-util", "toml_datetime", + "toml_edit 0.19.15", "tonic", "tower", "tracing", diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 372fbfa13b6f0..9ac71917cdcd5 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -122,6 +122,7 @@ tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e", features = ["fs", "net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } +toml_edit = { version = "0.19", features = ["serde"] } tonic = { version = "0.9", features = ["gzip", "tls-webpki-roots"] } tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] } tracing = { version = "0.1", features = ["log"] } @@ -210,8 +211,6 @@ tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e tokio-util = { version = "0.7", features = ["codec", "io"] } toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } toml_edit = { version = "0.19", features = ["serde"] } -tonic = { version = "0.9", features = ["gzip", "tls-webpki-roots"] } -tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] } tracing = { version = "0.1", features = ["log"] } tracing-core = { version = "0.1" } unicode-bidi = { version = "0.3" }