From 6548b6c51e87f84be1bfdde9457067d4353c4424 Mon Sep 17 00:00:00 2001
From: Evan Cameron <ecameron@bluecatnetworks.com>
Date: Sun, 7 Mar 2021 17:43:26 -0500
Subject: [PATCH] proto: fix cargo destructure

---
 crates/client/src/error/dnssec_error.rs |  6 +++---
 crates/proto/src/op/query.rs            |  8 ++++++++
 crates/proto/src/rr/resource.rs         | 11 +++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/crates/client/src/error/dnssec_error.rs b/crates/client/src/error/dnssec_error.rs
index 518117681c..a6653a9c8f 100644
--- a/crates/client/src/error/dnssec_error.rs
+++ b/crates/client/src/error/dnssec_error.rs
@@ -161,7 +161,7 @@ impl From<SslErrorStack> for Error {
 pub mod not_openssl {
     use std;
 
-    #[derive(Debug)]
+    #[derive(Debug, Clone, Copy)]
     pub struct SslErrorStack;
 
     impl std::fmt::Display for SslErrorStack {
@@ -181,10 +181,10 @@ pub mod not_openssl {
 pub mod not_ring {
     use std;
 
-    #[derive(Debug)]
+    #[derive(Debug, Clone, Copy)]
     pub struct KeyRejected;
 
-    #[derive(Debug)]
+    #[derive(Debug, Clone, Copy)]
     pub struct Unspecified;
 
     impl std::fmt::Display for KeyRejected {
diff --git a/crates/proto/src/op/query.rs b/crates/proto/src/op/query.rs
index fc45e0042e..7e90e231c0 100644
--- a/crates/proto/src/op/query.rs
+++ b/crates/proto/src/op/query.rs
@@ -183,12 +183,20 @@ pub struct QueryParts {
 
 impl From<Query> for QueryParts {
     fn from(q: Query) -> Self {
+        #[cfg(feature = "mdns")]
         let Query {
             name,
             query_type,
             query_class,
             mdns_unicast_response,
         } = q;
+        #[cfg(not(feature = "mdns"))]
+        let Query {
+            name,
+            query_type,
+            query_class,
+        } = q;
+
         Self {
             name,
             query_type,
diff --git a/crates/proto/src/rr/resource.rs b/crates/proto/src/rr/resource.rs
index e78b7aea94..b5fee500a5 100644
--- a/crates/proto/src/rr/resource.rs
+++ b/crates/proto/src/rr/resource.rs
@@ -291,6 +291,7 @@ pub struct RecordParts {
 
 impl From<Record> for RecordParts {
     fn from(record: Record) -> Self {
+        #[cfg(feature = "mdns")]
         let Record {
             name_labels,
             rr_type,
@@ -299,6 +300,16 @@ impl From<Record> for RecordParts {
             rdata,
             mdns_cache_flush,
         } = record;
+
+        #[cfg(not(feature = "mdns"))]
+        let Record {
+            name_labels,
+            rr_type,
+            dns_class,
+            ttl,
+            rdata,
+        } = record;
+
         RecordParts {
             name_labels,
             rr_type,