diff --git a/easytier/src/dns/zone.rs b/easytier/src/dns/zone.rs index 52bc0cd0..603809eb 100644 --- a/easytier/src/dns/zone.rs +++ b/easytier/src/dns/zone.rs @@ -4,7 +4,6 @@ use crate::dns::utils::authority::ArcAuthority; use crate::proto; use crate::proto::utils::RepeatedMessageModel; use crate::utils::MapTryInto; -use derivative::Derivative; use hickory_proto::rr::{LowerName, Record, RecordSet, RrKey, RrsetRecords}; use hickory_proto::serialize::txt::Parser; use hickory_resolver::config::ResolverOpts; @@ -19,13 +18,11 @@ use std::collections::BTreeMap; use std::sync::Arc; use uuid::Uuid; -#[derive(Derivative, Debug, Clone)] -#[derivative(PartialEq)] +#[derive(Debug, Clone)] pub struct Zone { id: Uuid, origin: LowerName, records: BTreeMap, - #[derivative(PartialEq(compare_with = "Zone::compare_forward"))] pub forward: Option, } @@ -41,19 +38,6 @@ impl Zone { zone.forward = Some(forward); zone } - - pub fn compare_forward(l: &Option, r: &Option) -> bool { - match (l, r) { - (Some(l), Some(r)) => l - .name_servers - .iter() - .cloned() - .map_into::() - .eq(r.name_servers.iter().cloned().map_into()), - (None, None) => true, - _ => false, - } - } } impl Zone {