Use derive-where instead of unmaintained derivative

anza-xyz · Oct 31, 2024 · 438a8fe · 438a8fe
1 parent 4994762
commit 438a8fe
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -264,7 +264,7 @@ ctrlc = "3.4.5"
 curve25519-dalek = { version = "4.1.3", features = ["digest", "rand_core"] }
 dashmap = "5.5.3"
 derivation-path = { version = "0.2.0", default-features = false }
-derivative = "2.2.0"
+derive-where = "1.2.7"
 dialoguer = "0.10.4"
 digest = "0.10.7"
 dir-diff = "0.3.3"

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/unified-scheduler-pool/Cargo.toml b/unified-scheduler-pool/Cargo.toml
@@ -13,7 +13,7 @@ edition = { workspace = true }
 assert_matches = { workspace = true }
 crossbeam-channel = { workspace = true }
 dashmap = { workspace = true }
-derivative = { workspace = true }
+derive-where = { workspace = true }
 log = { workspace = true }
 qualifier_attr = { workspace = true }
 scopeguard = { workspace = true }

diff --git a/unified-scheduler-pool/src/lib.rs b/unified-scheduler-pool/src/lib.rs
@@ -15,6 +15,7 @@ use {
     crossbeam_channel::{self, never, select_biased, Receiver, RecvError, SendError, Sender},
     dashmap::DashMap,
     derivative::Derivative,
+    derive_where::derive_where,
     log::*,
     scopeguard::defer,
     solana_ledger::blockstore_processor::{
@@ -569,8 +570,7 @@ mod chained_channel {
 
     // P doesn't need to be `: Clone`, yet rustc derive can't handle it.
     // see https://github.com/rust-lang/rust/issues/26925
-    #[derive(Derivative)]
-    #[derivative(Clone(bound = "C: Clone"))]
+    #[derive_where(Clone)]
     pub(super) struct ChainedChannelReceiver<P, C: Clone> {
         receiver: Receiver<ChainedChannel<P, C>>,
         aux_receiver: Receiver<P>,