replace derivative with educe crate

stackabletech · Dec 18, 2024 · 1737070 · 1737070
1 parent 48c0a11
commit 1737070
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.nix b/Cargo.nix
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ base64 = "0.22"
 built = { version = "0.7", features = ["chrono", "git2"] }
 byteorder = "1.5"
 clap = "4.5"
-derivative = "2.2"
+educe = { version = "0.6.0", default-features = false, features = ["Default"] }
 flate2 = "1.0"
 fnv = "1.0"
 futures = { version = "0.3" }

diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml
@@ -9,7 +9,7 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-derivative.workspace = true
+educe.workspace = true
 semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true

diff --git a/rust/crd/src/user_info_fetcher.rs b/rust/crd/src/user_info_fetcher.rs
@@ -1,6 +1,6 @@
 use std::collections::BTreeMap;
 
-use derivative::Derivative;
+use educe::Educe;
 use serde::{Deserialize, Serialize};
 use stackable_operator::{
     commons::{networking::HostName, tls_verification::TlsClientDetails},
@@ -115,12 +115,12 @@ pub struct ActiveDirectoryBackend {
     pub custom_attribute_mappings: BTreeMap<String, String>,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Derivative)]
-#[derivative(Default)]
+#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Educe)]
+#[educe(Default)]
 #[serde(rename_all = "camelCase")]
 pub struct Cache {
     /// How long metadata about each user should be cached for.
-    #[derivative(Default(value = "Cache::default_entry_time_to_live()"))]
+    #[educe(Default = Cache::default_entry_time_to_live())]
     #[serde(default = "Cache::default_entry_time_to_live")]
     pub entry_time_to_live: Duration,
 }