From 00167121dcaf8b5a57fecc5b3e24540942c38cc7 Mon Sep 17 00:00:00 2001 From: Jeff Lucovsky Date: Sat, 22 May 2021 08:33:44 -0400 Subject: [PATCH] dns: Rework constructs to use Self/Default --- rust/src/dns/dns.rs | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/rust/src/dns/dns.rs b/rust/src/dns/dns.rs index 6aaec88c91..350c165aee 100644 --- a/rust/src/dns/dns.rs +++ b/rust/src/dns/dns.rs @@ -315,8 +315,8 @@ pub struct DNSTransaction { impl DNSTransaction { - pub fn new() -> DNSTransaction { - return DNSTransaction{ + pub fn new() -> Self { + return Self { id: 0, request: None, response: None, @@ -398,6 +398,7 @@ impl ConfigTracker { } } +#[derive(Default)] pub struct DNSState { // Internal transaction ID. pub tx_id: u64, @@ -414,24 +415,12 @@ pub struct DNSState { impl DNSState { - pub fn new() -> DNSState { - return DNSState{ - tx_id: 0, - transactions: Vec::new(), - events: 0, - config: None, - gap: false, - }; + pub fn new() -> Self { + Default::default() } - pub fn new_tcp() -> DNSState { - return DNSState{ - tx_id: 0, - transactions: Vec::new(), - events: 0, - config: None, - gap: false, - }; + pub fn new_tcp() -> Self { + Default::default() } pub fn new_tx(&mut self) -> DNSTransaction {