Switch from derivative to educe

Zero improvement for users, it's just that `educe` hasn't been
abandoned yet.

Cargo.toml

@@ -21,8 +21,8 @@ clap = { version = "3.2.25", default-features = false, features = [
 ] }
 coarsetime = "0.1.34"
 daemonize-simple = "0.1.5"
-derivative = "2.2.0"
 dnsstamps = "0.1.9"
+educe = { version = "0.6.0", features = ["full"] }
 env_logger = { version = "0.11.5", default-features = false, features = [
   "humantime",
 ] }
@@ -35,24 +35,24 @@ ipext = "0.1.0"
 libsodium-sys-stable = "1.22.1"
 log = { version = "0.4.22", features = ["std", "release_max_level_debug"] }
 mimalloc = { version = "0.1.43", default-features = false }
-socket2 = "0.5.7"
 parking_lot = "0.12.3"
 rand = "0.8.5"
 rlimit = "0.10.2"
 rustc-hash = "2.0.0"
-serde = "1.0.214"
-serde_derive = "1.0.214"
+serde = "1.0.215"
+serde_derive = "1.0.215"
 serde-big-array = "0.5.1"
 sieve-cache = "0.2.1"
 siphasher = "1.0.1"
 slabigator = "0.9.2"
+socket2 = "0.5.7"
 tokio = { version = "1.41.1", features = [
   "net",
   "io-std",
   "io-util",
   "fs",
   "time",
-  "rt-multi-thread"
+  "rt-multi-thread",
 ] }
 toml = "0.8.19"
 

src/cache.rs

@@ -51,10 +51,10 @@ impl CachedResponse {
     }
 }
 
-#[derive(Clone, Derivative)]
-#[derivative(Debug)]
+#[derive(Clone, Educe)]
+#[educe(Debug)]
 pub struct Cache {
-    #[derivative(Debug = "ignore")]
+    #[educe(Debug(ignore))]
     cache: Arc<Mutex<SieveCache<u128, CachedResponse>>>,
     pub ttl_min: u32,
     pub ttl_max: u32,

src/crypto.rs

@@ -8,11 +8,10 @@ use siphasher::sip::SipHasher13;
 
 use crate::errors::*;
 
-#[derive(Derivative)]
-#[derivative(Default)]
+#[derive(Educe)]
+#[educe(Default)]
 pub struct Signature(
-    #[derivative(Default(value = "[0u8; crypto_sign_BYTES as usize]"))]
-    [u8; crypto_sign_BYTES as usize],
+    #[educe(Default = [0u8; crypto_sign_BYTES as usize])] [u8; crypto_sign_BYTES as usize],
 );
 
 impl Signature {
@@ -25,11 +24,11 @@ impl Signature {
     }
 }
 
-#[derive(Serialize, Deserialize, Derivative, Clone)]
-#[derivative(Default)]
+#[derive(Serialize, Deserialize, Educe, Clone)]
+#[educe(Default)]
 pub struct SignSK(
     #[serde(with = "BigArray")]
-    #[derivative(Default(value = "[0u8; crypto_sign_SECRETKEYBYTES as usize]"))]
+    #[educe(Default = [0u8; crypto_sign_SECRETKEYBYTES as usize])]
     [u8; crypto_sign_SECRETKEYBYTES as usize],
 );
 
@@ -75,10 +74,10 @@ impl SignPK {
     }
 }
 
-#[derive(Derivative, Serialize, Deserialize, Clone)]
-#[derivative(Debug, Default)]
+#[derive(Educe, Serialize, Deserialize, Clone)]
+#[educe(Debug, Default)]
 pub struct SignKeyPair {
-    #[derivative(Debug = "ignore")]
+    #[educe(Debug(ignore))]
     pub sk: SignSK,
     pub pk: SignPK,
 }

src/dnscrypt_certs.rs

@@ -41,14 +41,14 @@ impl DNSCryptCertInner {
     }
 }
 
-#[derive(Derivative, Serialize, Deserialize)]
-#[derivative(Debug, Default, Clone)]
+#[derive(Educe, Serialize, Deserialize)]
+#[educe(Debug, Default, Clone)]
 #[repr(C, packed)]
 pub struct DNSCryptCert {
     cert_magic: [u8; 4],
     es_version: [u8; 2],
     minor_version: [u8; 2],
-    #[derivative(Debug = "ignore", Default(value = "[0u8; 64]"))]
+    #[educe(Debug(ignore), Default = [0u8; 64])]
     #[serde(with = "BigArray")]
     signature: [u8; 64],
     inner: DNSCryptCertInner,
@@ -101,13 +101,13 @@ impl DNSCryptCert {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Derivative)]
-#[derivative(Debug)]
+#[derive(Serialize, Deserialize, Clone, Educe)]
+#[educe(Debug)]
 pub struct DNSCryptEncryptionParams {
     dnscrypt_cert: DNSCryptCert,
     resolver_kp: CryptKeyPair,
     #[serde(skip)]
-    #[derivative(Debug = "ignore")]
+    #[educe(Debug(ignore))]
     pub key_cache: Option<Arc<Mutex<SieveCache<[u8; DNSCRYPT_QUERY_PK_SIZE], SharedKey>>>>,
 }
 

src/globals.rs

@@ -17,8 +17,8 @@ use crate::dnscrypt_certs::*;
 #[cfg(feature = "metrics")]
 use crate::varz::*;
 
-#[derive(Clone, Derivative)]
-#[derivative(Debug)]
+#[derive(Clone, Educe)]
+#[educe(Debug)]
 pub struct Globals {
     pub runtime_handle: Handle,
     pub state_file: PathBuf,
@@ -53,6 +53,6 @@ pub struct Globals {
     pub client_ttl_holdon: u32,
     pub my_ip: Option<Vec<u8>>,
     #[cfg(feature = "metrics")]
-    #[derivative(Debug = "ignore")]
+    #[educe(Debug(ignore))]
     pub varz: Varz,
 }

src/main.rs

@@ -10,7 +10,7 @@
 static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 #[macro_use]
-extern crate derivative;
+extern crate educe;
 #[macro_use]
 extern crate log;
 #[macro_use]