Skip to content

Commit 44d7561

Browse files
committed
chore: Bump strum to 0.28.0
1 parent de9c8ce commit 44d7561

6 files changed

Lines changed: 11 additions & 14 deletions

File tree

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ sha2 = { version = "0.10.8", features = ["oid"] }
6767
signature = "2.2.0"
6868
snafu = "0.8.4"
6969
stackable-operator-derive = { path = "stackable-operator-derive" }
70-
strum = { version = "0.27.1", features = ["derive"] }
70+
strum = { version = "0.28.0", features = ["derive"] }
7171
syn = "2.0.77"
7272
tempfile = "3.12.0"
7373
time = { version = "0.3.36" }

crates/stackable-operator/src/cluster_resources.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ use k8s_openapi::{
2525
use kube::{Resource, ResourceExt};
2626
use serde::{Serialize, de::DeserializeOwned};
2727
use snafu::{OptionExt, ResultExt, Snafu};
28-
use strum::Display;
2928
use tracing::{debug, info, warn};
3029

3130
use crate::{
@@ -124,7 +123,7 @@ pub trait ClusterResource:
124123
/// The [`ClusterResourceApplyStrategy`] defines how to handle resources applied by the operators.
125124
/// This can be default behavior (apply_patch), only retrieving resources (get) for cluster status
126125
/// purposes or doing nothing.
127-
#[derive(Debug, Display, Eq, PartialEq)]
126+
#[derive(Debug, Eq, PartialEq, strum::Display)]
128127
pub enum ClusterResourceApplyStrategy {
129128
/// Default strategy. Resources a applied via the [`Client::apply_patch`] client method.
130129
Default,

crates/stackable-operator/src/commons/product_image_selection.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,8 @@ pub struct ResolvedProductImage {
8989
pub pull_secrets: Option<Vec<LocalObjectReference>>,
9090
}
9191

92-
#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
92+
#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, AsRefStr)]
9393
#[serde(rename = "PascalCase")]
94-
#[derive(AsRefStr)]
9594
/// We default to `Always`, as we use floating tags for our release lines.
9695
/// This means the tag 23.4 starts of pointing to the same image 23.4.0 does, but switches to 23.4.1 after the releases of 23.4.1.
9796
///

crates/stackable-operator/src/commons/resources.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ use k8s_openapi::{
8686
use schemars::JsonSchema;
8787
use serde::{Deserialize, Serialize};
8888
use snafu::{ResultExt, Snafu};
89-
use strum::Display;
9089

9190
use crate::{
9291
config::{
@@ -374,7 +373,7 @@ impl<T, K> Into<ResourceRequirements> for Resources<T, K> {
374373
/// [`ResourceRequirementsType`] describes the available resource requirement
375374
/// types. The user can set limits, requests and claims. This enum makes it
376375
/// possible to check if containers set one or more of these types.
377-
#[derive(Copy, Clone, Debug, Display, PartialEq, Eq, PartialOrd, Ord)]
376+
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, strum::Display)]
378377
#[strum(serialize_all = "lowercase")]
379378
pub enum ResourceRequirementsType {
380379
Requests,
@@ -386,7 +385,7 @@ pub enum ResourceRequirementsType {
386385
// Claims,
387386
}
388387

389-
#[derive(Copy, Clone, Debug, Display, PartialEq, Eq, PartialOrd, Ord)]
388+
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, strum::Display)]
390389
#[strum(serialize_all = "lowercase")]
391390
pub enum ComputeResource {
392391
Cpu,

crates/xtask/src/crd/dummy.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use stackable_operator::{
1010
status::condition::ClusterCondition,
1111
versioned::versioned,
1212
};
13-
use strum::{Display, EnumIter};
13+
use strum::EnumIter;
1414

1515
#[versioned(
1616
version(name = "v1alpha1"),
@@ -89,14 +89,14 @@ pub mod versioned {
8989
Clone,
9090
Debug,
9191
Deserialize,
92-
Display,
9392
Eq,
9493
EnumIter,
9594
JsonSchema,
9695
Ord,
9796
PartialEq,
9897
PartialOrd,
9998
Serialize,
99+
strum::Display,
100100
)]
101101
#[serde(rename_all = "kebab-case")]
102102
#[strum(serialize_all = "kebab-case")]

0 commit comments

Comments
 (0)