Bump strum from 0.22 -> 0.23 (paritytech#10758)

chainflip-io · Jan 31, 2022 · 2c45496 · 2c45496
1 parent 4b48e8e
commit 2c45496
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/beefy/Cargo.toml b/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/frame/election-provider-multi-phase/Cargo.toml b/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/frame/election-provider-multi-phase/src/lib.rs b/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/primitives/keyring/Cargo.toml b/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"] }