From 0bfbf5a89f45575a156d022b883907a848fc47ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 31 Jan 2022 21:04:12 +0100
Subject: [PATCH] Bump `strum` from 0.22 -> 0.23 (#10758)

---
 substrate/Cargo.lock                          | 32 +++----------------
 substrate/client/beefy/Cargo.toml             |  2 +-
 .../election-provider-multi-phase/Cargo.toml  |  8 +++--
 .../election-provider-multi-phase/src/lib.rs  |  4 +--
 substrate/primitives/keyring/Cargo.toml       |  2 +-
 5 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 773b770362..a45b3bf328 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -508,7 +508,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-tracing",
- "strum 0.22.0",
+ "strum",
  "substrate-prometheus-endpoint",
  "thiserror",
  "wasm-timer",
@@ -5710,8 +5710,7 @@ dependencies = [
  "sp-std",
  "sp-tracing",
  "static_assertions",
- "strum 0.22.0",
- "strum_macros 0.23.1",
+ "strum",
 ]
 
 [[package]]
@@ -9742,7 +9741,7 @@ dependencies = [
  "lazy_static",
  "sp-core",
  "sp-runtime",
- "strum 0.22.0",
+ "strum",
 ]
 
 [[package]]
@@ -10210,34 +10209,13 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
-[[package]]
-name = "strum"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e"
-dependencies = [
- "strum_macros 0.22.0",
-]
-
 [[package]]
 name = "strum"
 version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
 dependencies = [
- "strum_macros 0.23.1",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb"
-dependencies = [
- "heck 0.3.2",
- "proc-macro2",
- "quote",
- "syn",
+ "strum_macros",
 ]
 
 [[package]]
@@ -10488,7 +10466,7 @@ dependencies = [
  "build-helper",
  "cargo_metadata",
  "sp-maybe-compressed-blob",
- "strum 0.23.0",
+ "strum",
  "tempfile",
  "toml",
  "walkdir",
diff --git a/substrate/client/beefy/Cargo.toml b/substrate/client/beefy/Cargo.toml
index 9761f18d78..3bef549938 100644
--- a/substrate/client/beefy/Cargo.toml
+++ b/substrate/client/beefy/Cargo.toml
@@ -39,4 +39,4 @@ beefy-primitives = { version = "4.0.0-dev", path = "../../primitives/beefy" }
 sp-tracing = { version = "4.0.0", path = "../../primitives/tracing" }
 sc-network-test = { version = "0.8.0", path = "../network/test" }
 
-strum = { version = "0.22", features = ["derive"] }
+strum = { version = "0.23", features = ["derive"] }
diff --git a/substrate/frame/election-provider-multi-phase/Cargo.toml b/substrate/frame/election-provider-multi-phase/Cargo.toml
index 7add94dc76..062e63f5fd 100644
--- a/substrate/frame/election-provider-multi-phase/Cargo.toml
+++ b/substrate/frame/election-provider-multi-phase/Cargo.toml
@@ -37,8 +37,7 @@ rand = { version = "0.7.3", default-features = false, optional = true, features
 	"alloc",
 	"small_rng",
 ] }
-strum = { optional = true, version = "0.22.0" }
-strum_macros = { optional = true, version = "0.23.1" }
+strum = { optional = true, default-features = false, version = "0.23.0", features = ["derive"] }
 
 [dev-dependencies]
 parking_lot = "0.11.2"
@@ -70,12 +69,15 @@ std = [
 	"sp-arithmetic/std",
 	"frame-election-provider-support/std",
 	"log/std",
+
+	"frame-benchmarking/std",
+	"rand/std",
+	"strum/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-election-provider-support/runtime-benchmarks",
 	"rand",
 	"strum",
-	"strum_macros",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/substrate/frame/election-provider-multi-phase/src/lib.rs b/substrate/frame/election-provider-multi-phase/src/lib.rs
index 2b48373c5b..0a620e6c12 100644
--- a/substrate/frame/election-provider-multi-phase/src/lib.rs
+++ b/substrate/frame/election-provider-multi-phase/src/lib.rs
@@ -488,7 +488,7 @@ pub struct SolutionOrSnapshotSize {
 ///
 /// Note that this is different from [`pallet::Error`].
 #[derive(frame_support::DebugNoBound)]
-#[cfg_attr(feature = "runtime-benchmarks", derive(strum_macros::IntoStaticStr))]
+#[cfg_attr(feature = "runtime-benchmarks", derive(strum::IntoStaticStr))]
 pub enum ElectionError<T: Config> {
 	/// An error happened in the feasibility check sub-system.
 	Feasibility(FeasibilityError),
@@ -533,7 +533,7 @@ impl<T: Config> From<unsigned::MinerError<T>> for ElectionError<T> {
 
 /// Errors that can happen in the feasibility check.
 #[derive(Debug, Eq, PartialEq)]
-#[cfg_attr(feature = "runtime-benchmarks", derive(strum_macros::IntoStaticStr))]
+#[cfg_attr(feature = "runtime-benchmarks", derive(strum::IntoStaticStr))]
 pub enum FeasibilityError {
 	/// Wrong number of winners presented.
 	WrongWinnerCount,
diff --git a/substrate/primitives/keyring/Cargo.toml b/substrate/primitives/keyring/Cargo.toml
index a457f4983c..a31dcc51d0 100644
--- a/substrate/primitives/keyring/Cargo.toml
+++ b/substrate/primitives/keyring/Cargo.toml
@@ -18,4 +18,4 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-core = { version = "4.1.0-dev", path = "../core" }
 sp-runtime = { version = "4.1.0-dev", path = "../runtime" }
 lazy_static = "1.4.0"
-strum = { version = "0.22.0", features = ["derive"] }
+strum = { version = "0.23.0", features = ["derive"] }