From 7dcaae8a0067ce4b09d02e8db3cfa89d977014b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 01:41:00 +0000 Subject: [PATCH 1/2] chore(deps): Bump strum from 0.25.0 to 0.26.1 Bumps [strum](https://github.com/Peternator7/strum) from 0.25.0 to 0.26.1. - [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md) - [Commits](https://github.com/Peternator7/strum/commits) --- updated-dependencies: - dependency-name: strum dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 11 +++++++---- src/cmd_all/Cargo.toml | 2 +- src/meta/Cargo.toml | 2 +- src/prost/Cargo.toml | 2 +- src/workspace-hack/Cargo.toml | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 380e0aa50e3e5..09da7bc646b39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8913,7 +8913,7 @@ dependencies = [ "risingwave_meta_node", "risingwave_rt", "shell-words", - "strum 0.25.0", + "strum 0.26.1", "strum_macros 0.26.1", "tempfile", "thiserror-ext", @@ -9821,7 +9821,7 @@ dependencies = [ "sea-orm", "serde", "serde_json", - "strum 0.25.0", + "strum 0.26.1", "sync-point", "thiserror", "thiserror-ext", @@ -9985,7 +9985,7 @@ dependencies = [ "prost-helpers", "risingwave_error", "serde", - "strum 0.25.0", + "strum 0.26.1", "thiserror", "walkdir", "workspace-hack", @@ -12078,6 +12078,9 @@ name = "strum" version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +dependencies = [ + "strum_macros 0.26.1", +] [[package]] name = "strum_macros" @@ -14362,7 +14365,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "strum 0.25.0", + "strum 0.26.1", "subtle", "syn 1.0.109", "syn 2.0.48", diff --git a/src/cmd_all/Cargo.toml b/src/cmd_all/Cargo.toml index cc9befc068d0c..1d1c617bfa1fe 100644 --- a/src/cmd_all/Cargo.toml +++ b/src/cmd_all/Cargo.toml @@ -37,7 +37,7 @@ risingwave_frontend = { workspace = true } risingwave_meta_node = { workspace = true } risingwave_rt = { workspace = true } shell-words = "1.1.0" -strum = "0.25" +strum = "0.26" strum_macros = "0.26" tempfile = "3" tikv-jemallocator = { workspace = true, features = [ diff --git a/src/meta/Cargo.toml b/src/meta/Cargo.toml index 822a71d3ad17b..0119f6abfe06c 100644 --- a/src/meta/Cargo.toml +++ b/src/meta/Cargo.toml @@ -65,7 +65,7 @@ scopeguard = "1.2.0" sea-orm = { workspace = true } serde = { version = "1.0.196", features = ["derive"] } serde_json = "1.0.113" -strum = { version = "0.25", features = ["derive"] } +strum = { version = "0.26", features = ["derive"] } sync-point = { path = "../utils/sync-point" } thiserror = "1" thiserror-ext = { workspace = true } diff --git a/src/prost/Cargo.toml b/src/prost/Cargo.toml index d46e1baf2b4fe..af12b1683959c 100644 --- a/src/prost/Cargo.toml +++ b/src/prost/Cargo.toml @@ -14,7 +14,7 @@ prost = { workspace = true } prost-helpers = { path = "helpers" } risingwave_error = { workspace = true } serde = { version = "1", features = ["derive"] } -strum = "0.25" +strum = "0.26" thiserror = "1" tonic = { workspace = true } diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 177ce846390dd..d0975e0aa65fe 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -129,7 +129,7 @@ sqlx-core = { version = "0.7", features = ["_rt-tokio", "_tls-native-tls", "bigd sqlx-mysql = { version = "0.7", default-features = false, features = ["bigdecimal", "chrono", "json", "rust_decimal", "time", "uuid"] } sqlx-postgres = { version = "0.7", default-features = false, features = ["bigdecimal", "chrono", "json", "rust_decimal", "time", "uuid"] } sqlx-sqlite = { version = "0.7", default-features = false, features = ["chrono", "json", "time", "uuid"] } -strum = { version = "0.25", features = ["derive"] } +strum = { version = "0.26", features = ["derive"] } subtle = { version = "2" } syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] } target-lexicon = { version = "0.12", features = ["std"] } From 5674f218ed3a791395a3d40955d5d1f3ca8c0652 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 2 Apr 2024 01:42:29 +0000 Subject: [PATCH 2/2] Fix "cargo-hakari" --- Cargo.lock | 1 + src/workspace-hack/Cargo.toml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 09da7bc646b39..926992f548b28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14365,6 +14365,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", + "strum 0.25.0", "strum 0.26.1", "subtle", "syn 1.0.109", diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index d0975e0aa65fe..1ccd14ff77a17 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -129,7 +129,8 @@ sqlx-core = { version = "0.7", features = ["_rt-tokio", "_tls-native-tls", "bigd sqlx-mysql = { version = "0.7", default-features = false, features = ["bigdecimal", "chrono", "json", "rust_decimal", "time", "uuid"] } sqlx-postgres = { version = "0.7", default-features = false, features = ["bigdecimal", "chrono", "json", "rust_decimal", "time", "uuid"] } sqlx-sqlite = { version = "0.7", default-features = false, features = ["chrono", "json", "time", "uuid"] } -strum = { version = "0.26", features = ["derive"] } +strum-2f80eeee3b1b6c7e = { package = "strum", version = "0.26", features = ["derive"] } +strum-2ffb4c3fe830441c = { package = "strum", version = "0.25", features = ["derive"] } subtle = { version = "2" } syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] } target-lexicon = { version = "0.12", features = ["std"] }