tailhook · Dec 24, 2021
Showing with 12 additions and 10 deletions.

+3 −5 Cargo.toml

+2 −1 src/enums.rs

+2 −1 src/lib.rs

+2 −1 src/rdata/a.rs

+2 −1 src/rdata/aaaa.rs

+1 −1 src/rdata/txt.rs
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,15 +13,13 @@ documentation = "https://docs.rs/dns-parser"
 version = "0.8.0"
 authors = ["Paul Colomiets <paul@colomiets.name>"]
 
-[features]
-with-serde = ["serde", "serde_derive"]
+# [features]
+# with-serde = ["serde", "serde_derive"]
 
 [dependencies]
 quick-error = "1.0.0"
 byteorder = "1"
-
-serde = { version = "1.0", optional = true }
-serde_derive = { version = "1.0", optional = true }
+serde = { version = "1.0", features = ["derive"] }
 
 [dev-dependencies]
 matches = "0.1.2"
diff --git a/src/enums.rs b/src/enums.rs
@@ -1,6 +1,7 @@
 use {Error};
 use rdata::Record;
 use rdata::*;
+use serde::Serialize;
 
 /// The TYPE value according to RFC 1035
 ///
@@ -143,7 +144,7 @@ pub enum Opcode {
 
 quick_error! {
     /// The RCODE value according to RFC 1035
-    #[derive(Debug, PartialEq, Eq, Clone, Copy)]
+    #[derive(Debug, PartialEq, Eq, Clone, Copy, Serialize)]
     #[allow(missing_docs)] // names are from spec
     pub enum ResponseCode {
         NoError

diff --git a/src/lib.rs b/src/lib.rs
@@ -16,9 +16,10 @@
 #![warn(missing_debug_implementations)]
 
 extern crate byteorder;
+extern crate serde;
 #[cfg(test)] #[macro_use] extern crate matches;
 #[macro_use(quick_error)] extern crate quick_error;
-#[cfg(feature = "with-serde")] #[macro_use] extern crate serde_derive;
+//#[cfg(feature = "with-serde")] #[macro_use] extern crate serde_derive;
 
 mod enums;
 mod structs;

diff --git a/src/rdata/a.rs b/src/rdata/a.rs
@@ -2,8 +2,9 @@ use std::net::Ipv4Addr;
 
 use Error;
 use byteorder::{BigEndian, ByteOrder};
+use serde::Serialize;
 
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Serialize)]
 pub struct Record(pub Ipv4Addr);
 
 impl<'a> super::Record<'a> for Record {

diff --git a/src/rdata/aaaa.rs b/src/rdata/aaaa.rs
@@ -2,8 +2,9 @@ use std::net::Ipv6Addr;
 
 use Error;
 use byteorder::{BigEndian, ByteOrder};
+use serde::Serialize;
 
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Serialize)]
 pub struct Record(pub Ipv6Addr);
 
 impl<'a> super::Record<'a> for Record {

diff --git a/src/rdata/txt.rs b/src/rdata/txt.rs
@@ -2,7 +2,7 @@ use Error;
 
 #[derive(Debug, Clone)]
 pub struct Record<'a> {
-    bytes: &'a [u8],
+    pub bytes: &'a [u8],
 }
 
 #[derive(Debug)]