Skip to content

Commit 1737070

Browse files
committed
replace derivative with educe crate
1 parent 48c0a11 commit 1737070

File tree

5 files changed

+41
-77
lines changed

5 files changed

+41
-77
lines changed

Cargo.lock

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

Cargo.nix

Lines changed: 21 additions & 46 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
@@ -16,7 +16,7 @@ base64 = "0.22"
1616
built = { version = "0.7", features = ["chrono", "git2"] }
1717
byteorder = "1.5"
1818
clap = "4.5"
19-
derivative = "2.2"
19+
educe = { version = "0.6.0", default-features = false, features = ["Default"] }
2020
flate2 = "1.0"
2121
fnv = "1.0"
2222
futures = { version = "0.3" }

rust/crd/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repository.workspace = true
99
publish = false
1010

1111
[dependencies]
12-
derivative.workspace = true
12+
educe.workspace = true
1313
semver.workspace = true
1414
serde.workspace = true
1515
serde_json.workspace = true

rust/crd/src/user_info_fetcher.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::collections::BTreeMap;
22

3-
use derivative::Derivative;
3+
use educe::Educe;
44
use serde::{Deserialize, Serialize};
55
use stackable_operator::{
66
commons::{networking::HostName, tls_verification::TlsClientDetails},
@@ -115,12 +115,12 @@ pub struct ActiveDirectoryBackend {
115115
pub custom_attribute_mappings: BTreeMap<String, String>,
116116
}
117117

118-
#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Derivative)]
119-
#[derivative(Default)]
118+
#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Educe)]
119+
#[educe(Default)]
120120
#[serde(rename_all = "camelCase")]
121121
pub struct Cache {
122122
/// How long metadata about each user should be cached for.
123-
#[derivative(Default(value = "Cache::default_entry_time_to_live()"))]
123+
#[educe(Default = Cache::default_entry_time_to_live())]
124124
#[serde(default = "Cache::default_entry_time_to_live")]
125125
pub entry_time_to_live: Duration,
126126
}

0 commit comments

Comments
 (0)