Skip to content

Commit 9f49e3c

Browse files
committed
remove educe crate
1 parent 1737070 commit 9f49e3c

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

Cargo.lock

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

Cargo.nix

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

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ base64 = "0.22"
1616
built = { version = "0.7", features = ["chrono", "git2"] }
1717
byteorder = "1.5"
1818
clap = "4.5"
19-
educe = { version = "0.6.0", default-features = false, features = ["Default"] }
2019
flate2 = "1.0"
2120
fnv = "1.0"
2221
futures = { version = "0.3" }

rust/crd/Cargo.toml

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

1111
[dependencies]
12-
educe.workspace = true
1312
semver.workspace = true
1413
serde.workspace = true
1514
serde_json.workspace = true

rust/crd/src/user_info_fetcher.rs

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

3-
use educe::Educe;
43
use serde::{Deserialize, Serialize};
54
use stackable_operator::{
65
commons::{networking::HostName, tls_verification::TlsClientDetails},
@@ -115,12 +114,10 @@ pub struct ActiveDirectoryBackend {
115114
pub custom_attribute_mappings: BTreeMap<String, String>,
116115
}
117116

118-
#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Educe)]
119-
#[educe(Default)]
117+
#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
120118
#[serde(rename_all = "camelCase")]
121119
pub struct Cache {
122120
/// How long metadata about each user should be cached for.
123-
#[educe(Default = Cache::default_entry_time_to_live())]
124121
#[serde(default = "Cache::default_entry_time_to_live")]
125122
pub entry_time_to_live: Duration,
126123
}
@@ -130,3 +127,11 @@ impl Cache {
130127
Duration::from_minutes_unchecked(1)
131128
}
132129
}
130+
131+
impl Default for Cache {
132+
fn default() -> Self {
133+
Self {
134+
entry_time_to_live: Self::default_entry_time_to_live(),
135+
}
136+
}
137+
}

0 commit comments

Comments
 (0)