Skip to content

Commit 7268ed0

Browse files
committed
Fix compiler warnings
1 parent b6ac4ec commit 7268ed0

File tree

15 files changed

+56
-49
lines changed

15 files changed

+56
-49
lines changed

src/async_resolver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ impl AsyncResolver {
188188

189189

190190
if self.config.get_tsig(){
191-
self.verify_tsig(response.clone());
191+
let _ = self.verify_tsig(response.clone());
192192
}
193193

194194
return self.check_error_from_msg(response);

src/async_resolver/config.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ impl ResolverConfig {
120120
retransmission_loop_attempts: 3,
121121
cache_enabled: true,
122122
recursive_available: false,
123-
protocol: protocol,
124-
timeout: timeout,
123+
protocol,
124+
timeout,
125125
max_retry_interval_seconds: 10,
126126
min_retry_interval_seconds: 1,
127127
global_retransmission_limit: 30,
@@ -163,14 +163,14 @@ impl ResolverConfig {
163163
let resolver_config: ResolverConfig = ResolverConfig {
164164
name_servers: servers_info,
165165
bind_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 5333),
166-
retransmission_loop_attempts: retransmission_loop_attempts,
166+
retransmission_loop_attempts,
167167
cache_enabled: true,
168168
recursive_available: false,
169169
protocol: ConnectionProtocol::UDP,
170-
timeout: timeout,
171-
max_retry_interval_seconds: max_retry_interval_seconds,
172-
min_retry_interval_seconds: min_retry_interval_seconds,
173-
global_retransmission_limit: global_retransmission_limit,
170+
timeout,
171+
max_retry_interval_seconds,
172+
min_retry_interval_seconds,
173+
global_retransmission_limit,
174174
edns0: false,
175175
max_payload: RECOMMENDED_MAX_PAYLOAD as u16,
176176
bufsize: RECOMMENDED_MAX_PAYLOAD as u16,
@@ -318,7 +318,7 @@ impl ResolverConfig {
318318
/// ```
319319
#[cfg(any(target_os = "linux", target_os = "macos"))]
320320
pub fn os_config() -> Self {
321-
let mut path = "";
321+
let path;
322322
if env::consts::OS == "macos" {
323323
path = "var/run/resolv.conf";
324324
} else {

src/async_resolver/lookup.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub struct LookupStrategy {
2626
/// Resolver configuration.
2727
config: ResolverConfig,
2828
/// Reference to the response of the query.
29-
response_msg: Arc<std::sync::Mutex<Result<(DnsMessage, Vec<u8>), ResolverError>>>,
29+
response_msg: Arc<Mutex<Result<(DnsMessage, Vec<u8>), ResolverError>>>,
3030
}
3131

3232
impl LookupStrategy {
@@ -38,8 +38,8 @@ impl LookupStrategy {
3838

3939
) -> Self {
4040
Self {
41-
query: query,
42-
config: config,
41+
query,
42+
config,
4343
response_msg: Arc::new(Mutex::new(Err(ResolverError::EmptyQuery))),
4444
}
4545
}
@@ -103,7 +103,7 @@ impl LookupStrategy {
103103
timeout_duration = tokio::time::Duration::from_secs_f64(rto);
104104
tokio::time::sleep(timeout_duration).await;
105105
}
106-
return lookup_response_result;
106+
lookup_response_result
107107
}
108108

109109
/// Checks if an appropiate answer was received.
@@ -115,7 +115,7 @@ impl LookupStrategy {
115115
// appropriate response to its caller.
116116
pub fn received_appropriate_response(&self) -> bool {
117117
let response_arc = self.response_msg.lock().unwrap();
118-
if let Ok((dns_msg, bytes)) = response_arc.as_ref() {
118+
if let Ok((dns_msg, _)) = response_arc.as_ref() {
119119
match dns_msg.get_header().get_rcode().into() {
120120
Rcode::SERVFAIL => return false,
121121
Rcode::NOTIMP => return false,

src/async_resolver/slist/slist_element.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ impl SlistElement{
2121
/// * `response_time` - A u16 that represents the response time of the slist element
2222
pub fn new(domain_name: DomainName, ip_address: IpAddr, response_time: u32) -> SlistElement{
2323
SlistElement{
24-
domain_name: domain_name,
25-
ip_address: ip_address,
26-
response_time: response_time,
24+
domain_name,
25+
ip_address,
26+
response_time,
2727
}
2828
}
2929
}

src/client/udp_connection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl ClientConnection for ClientUDPConnection {
3838
/// implement get_ip
3939
/// returns IpAddr
4040
fn get_ip(&self) -> IpAddr {
41-
return self.server_addr.clone();
41+
self.server_addr.clone()
4242
}
4343

4444
async fn send(self, dns_query:DnsMessage) -> Result<Vec<u8>, ClientError> {

src/dns_cache.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl DnsCache {
7676

7777
if let Some(existing_record) = self.cache.get_mut(&key) {
7878
// If the key is already cached
79-
if let Some(stored) = existing_record.take(&rr_cache) {
79+
if let Some(_) = existing_record.take(&rr_cache) {
8080
// If a stored record with the same resource record exists, replace it
8181
existing_record.replace(rr_cache);
8282
} else {

src/dns_cache/rr_stored_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ impl RRStoredData {
4545
pub fn new(resource_record: ResourceRecord) -> Self {
4646
let rr_cache = RRStoredData {
4747
rcode: Rcode::NOERROR,
48-
resource_record: resource_record,
48+
resource_record,
4949
response_time: 5000,
5050
creation_time: Utc::now(),
5151
};

src/dnssec/dnssec_message.rs

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
use crate::domain_name::DomainName;
21
use crate::message::rclass::Rclass;
32
use crate::message::DnsMessage;
43
use crate::message::rdata::opt_rdata::OptRdata;
54
use crate::message::rdata::Rdata;
65
use crate::message::resource_record::{ResourceRecord};
76
use crate::message::rcode::Rcode;
8-
use crate::message::rrtype::Rrtype;
97

108
const EDNS_VERSION: u8 = 0;
119
const REQUESTED_UDP_LEN: u16 = 4096;
@@ -45,7 +43,7 @@ fn read_opt_rr(opt_rr: ResourceRecord) -> (u16, Rcode, u8, bool) {
4543
let (e_rcode, version) = (data[0], data[1]);
4644
let z = u16::from_be_bytes([data[2], data[3]]);
4745

48-
let do_bit = ((z & 0x8000) > 0) as bool ;
46+
let do_bit = (z & 0x8000) > 0;
4947
(requested_udp_len, Rcode::from(e_rcode), version, do_bit)
5048
//format!("OPT PSEUDO-RR\n\trequested_udp_len: {requested_udp_len}\n\terror code: {e_rcode}\n\tversion: EDNS{version}\n\tuse dnssec: {do_bit}")
5149
}
@@ -64,19 +62,29 @@ fn add_opt_record_dns_message(msg: &mut DnsMessage, capacity: u16, e_rcode :Rcod
6462
msg.update_header_counters();
6563
}
6664

67-
#[test]
68-
fn see_dnssec_message() {
69-
let mut query = DnsMessage::new_query_message(
70-
DomainName::new_from_str("example.com"),
71-
Rrtype::A,
72-
Rclass::IN,
73-
1,
74-
true,
75-
2000
76-
);
77-
add_opt_record_dns_message(&mut query, 4096, Rcode::NOERROR, true);
78-
let expected = (4096,Rcode::NOERROR,0,true);
79-
assert_eq!(expected,
80-
read_opt_rr(query.get_additional().pop().expect("No OPT Record!"))
81-
)
65+
#[cfg(test)]
66+
mod dnssec_message_processing_tests {
67+
use crate::dnssec::dnssec_message::{add_opt_record_dns_message, read_opt_rr};
68+
use crate::domain_name::DomainName;
69+
use crate::message::rrtype::Rrtype;
70+
use crate::message::rclass::Rclass;
71+
use crate::message::DnsMessage;
72+
use crate::message::rcode::Rcode;
73+
74+
#[test]
75+
fn see_dnssec_message() {
76+
let mut query = DnsMessage::new_query_message(
77+
DomainName::new_from_str("example.com"),
78+
Rrtype::A,
79+
Rclass::IN,
80+
1,
81+
true,
82+
2000
83+
);
84+
add_opt_record_dns_message(&mut query, 4096, Rcode::NOERROR, true);
85+
let expected = (4096, Rcode::NOERROR, 0, true);
86+
assert_eq!(expected,
87+
read_opt_rr(query.get_additional().pop().expect("No OPT Record!"))
88+
)
89+
}
8290
}

src/dnssec/dnssec_message_processing.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use crate::message::resource_record::ResourceRecord;
33
use crate::message::rrset::RRset;
44
use crate::message::rrtype::Rrtype;
55

6-
use crate::message::resource_record::ToBytes;
76

87
pub fn extract_signed_rrsets(rrs: &Vec<ResourceRecord>) -> Option<Vec<(ResourceRecord, RRset)>> {
98
// check if there exists RRSIG records
@@ -28,7 +27,7 @@ pub fn extract_signed_rrsets(rrs: &Vec<ResourceRecord>) -> Option<Vec<(ResourceR
2827
let rrs_filtered = rrs_filtered?;
2928
result.push((rrsig_rr.clone(), rrs_filtered));
3029
}
31-
return Some(result);
30+
Some(result)
3231
}
3332
#[cfg(test)]
3433
mod dnssec_message_processing_tests {
@@ -41,6 +40,7 @@ mod dnssec_message_processing_tests {
4140
use crate::message::resource_record::{ResourceRecord, ToBytes};
4241
use crate::message::rrtype::Rrtype;
4342

43+
4444
#[test]
4545
pub fn test_extract_signed_rrsets() {
4646
use std::net::IpAddr;
@@ -52,7 +52,7 @@ mod dnssec_message_processing_tests {
5252
header.set_qr(true);
5353
header.set_rd(true);
5454
message.set_header(header);
55-
let mut question = crate::message::question::Question::new();
55+
let mut question = message::question::Question::new();
5656
question.set_qname(DomainName::new_from_str("example.com"));
5757
question.set_rrtype(Rrtype::A);
5858
question.set_rclass(Rclass::IN);

src/domain_name.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl DomainName {
9191
}
9292
}
9393

94-
let (domain_label, _bytes) = domain_name_result.unwrap();
94+
let (domain_label, _bytes) = domain_name_result?;
9595

9696
let label = domain_label.get_name();
9797

@@ -168,7 +168,7 @@ impl DomainName {
168168
}
169169
}
170170

171-
bytes.push(0 as u8);
171+
bytes.push(0u8);
172172

173173
bytes
174174
}

0 commit comments

Comments
 (0)