colin/hickory-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanliness updates for rustc 1.73

Browse Source
This commit is contained in:
Benjamin Fry 2023-10-06 13:53:14 -07:00
parent a846914b11
commit c9a2ce42cb
11 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/proto/src/rr/type_bit_map.rs
View File

@ -44,7 +44,7 @@ pub(crate) fn encode_type_bit_maps(
let window: u8 = (code >> 8) as u8;
let low: u8 = (code & 0x00FF) as u8;
let bit_map: &mut Vec<u8> = hash.entry(window).or_insert_with(Vec::new);
let bit_map: &mut Vec<u8> = hash.entry(window).or_default();
// len + left is the block in the bitmap, divided by 8 for the bits, + the bit in the current_byte
let index: u8 = low / 8;
let bit: u8 = 0b1000_0000 >> (low % 8);

6
crates/proto/src/xfer/dnssec_dns_handle.rs
View File

@ -382,8 +382,10 @@ where
}
// check if any are valid, otherwise return whatever error caused it to fail
if verified_rrsets.is_empty() && last_validation_err.is_some() {
return Err(last_validation_err.expect("can not be none based on above check"));
if verified_rrsets.is_empty() {
if let Some(last_validation_err) = last_validation_err {
return Err(last_validation_err);
}
}
// validated not none above...

4
crates/resolver/src/dns_lru.rs
View File

@ -247,9 +247,7 @@ impl DnsLru {
let ttl = record.ttl();
map.entry(query)
.or_insert_with(Vec::default)
.push((record, ttl));
map.entry(query).or_default().push((record, ttl));
map
},

5
crates/resolver/src/hosts.rs
View File

@ -64,10 +64,7 @@ impl Hosts {
pub fn insert(&mut self, name: Name, record_type: RecordType, lookup: Lookup) {
assert!(record_type == RecordType::A || record_type == RecordType::AAAA);
let lookup_type = self
.by_name
.entry(name.clone())
.or_insert_with(LookupType::default);
let lookup_type = self.by_name.entry(name.clone()).or_default();
let new_lookup = {
let old_lookup = match record_type {

6
crates/server/src/server/server_future.rs
View File

@ -612,11 +612,9 @@ impl<T: RequestHandler> ServerFuture<T> {
let tls_acceptor = TlsAcceptor::from(Arc::new(tls_acceptor));
// for each incoming request...
let dns_hostname = dns_hostname;
let shutdown = self.shutdown_token.clone();
self.join_set.spawn(async move {
let mut inner_join_set = JoinSet::new();
let dns_hostname = dns_hostname;
loop {
let shutdown = shutdown.clone();
let (tcp_stream, src_addr) = tokio::select! {
@ -713,11 +711,9 @@ impl<T: RequestHandler> ServerFuture<T> {
QuicServer::with_socket(socket, certificate_and_key.0, certificate_and_key.1)?;
// for each incoming request...
let dns_hostname = dns_hostname;
let shutdown = self.shutdown_token.clone();
self.join_set.spawn(async move {
let mut inner_join_set = JoinSet::new();
let dns_hostname = dns_hostname;
loop {
let shutdown = shutdown.clone();
let (streams, src_addr) = tokio::select! {
@ -806,11 +802,9 @@ impl<T: RequestHandler> ServerFuture<T> {
H3Server::with_socket(socket, certificate_and_key.0, certificate_and_key.1)?;
// for each incoming request...
let dns_hostname = dns_hostname;
let shutdown = self.shutdown_token.clone();
self.join_set.spawn(async move {
let mut inner_join_set = JoinSet::new();
let dns_hostname = dns_hostname;
loop {
let shutdown = shutdown.clone();
let (streams, src_addr) = tokio::select! {

2
crates/server/src/store/file/authority.rs
View File

@ -68,7 +68,7 @@ impl FileAuthority {
root_dir: Option<&Path>,
config: &FileConfig,
) -> Result<Self, String> {
let root_dir_path = root_dir.map(PathBuf::from).unwrap_or_else(PathBuf::new);
let root_dir_path = root_dir.map(PathBuf::from).unwrap_or_default();
let zone_path = root_dir_path.join(&config.zone_file_path);
info!("loading zone file: {:?}", zone_path);

2
crates/server/src/store/sqlite/authority.rs
View File

@ -85,7 +85,7 @@ impl SqliteAuthority {
let zone_name: Name = origin;
let root_zone_dir = root_dir.map(PathBuf::from).unwrap_or_else(PathBuf::new);
let root_zone_dir = root_dir.map(PathBuf::from).unwrap_or_default();
// to be compatible with previous versions, the extension might be zone, not jrnl
let journal_path: PathBuf = root_zone_dir.join(&config.journal_file_path);

1
tests/compatibility-tests/tests/sig0_tests.rs
View File

@ -130,7 +130,6 @@ fn test_create() {
assert_eq!(result.response_code(), ResponseCode::YXRRSet);
// will fail if already set and not the same value.
let mut record = record;
record.set_data(Some(RData::A(A::new(101, 11, 101, 11))));
let result = client.create(record, origin).expect("create failed");

1
tests/compatibility-tests/tests/tsig_tests.rs
View File

@ -86,7 +86,6 @@ fn test_create() {
assert_eq!(result.response_code(), ResponseCode::YXRRSet);
// will fail if already set and not the same value.
let mut record = record;
record.set_data(Some(RData::A(A::new(101, 11, 101, 11))));
let result = client.create(record, origin).expect("create failed");

2
tests/integration-tests/tests/client_future_tests.rs
View File

@ -888,7 +888,6 @@ fn test_delete_rrset() {
.expect("create failed");
assert_eq!(result.response_code(), ResponseCode::NoError);
let mut record = record;
record.set_data(Some(RData::A(A::new(101, 11, 101, 11))));
let result = io_loop
.block_on(client.append(record.clone(), origin.clone(), true))
@ -941,7 +940,6 @@ fn test_delete_all() {
.expect("create failed");
assert_eq!(result.response_code(), ResponseCode::NoError);
let mut record = record;
record.set_rr_type(RecordType::AAAA);
record.set_data(Some(RData::AAAA(AAAA::new(1, 2, 3, 4, 5, 6, 7, 8))));
let result = io_loop

6
tests/integration-tests/tests/client_tests.rs
View File

@ -516,7 +516,6 @@ fn test_create() {
assert_eq!(result.response_code(), ResponseCode::YXRRSet);
// will fail if already set and not the same value.
let mut record = record;
record.set_data(Some(RData::A(A::new(101, 11, 101, 11))));
let result = client.create(record, origin).expect("create failed");
@ -558,7 +557,6 @@ fn test_append() {
assert_eq!(result.answers()[0], record);
// will fail if already set and not the same value.
let mut record = record;
record.set_data(Some(RData::A(A::new(101, 11, 101, 11))));
let result = client
@ -645,7 +643,6 @@ fn test_compare_and_swap() {
}));
// check the it fails if tried again.
let mut new = new;
new.set_data(Some(RData::A(A::new(102, 12, 102, 12))));
let result = client
@ -694,7 +691,6 @@ fn test_delete_by_rdata() {
.expect("create failed");
assert_eq!(result.response_code(), ResponseCode::NoError);
let mut record = record;
record.set_data(Some(RData::A(A::new(101, 11, 101, 11))));
let result = client
.append(record.clone(), origin.clone(), true)
@ -748,7 +744,6 @@ fn test_delete_rrset() {
.expect("create failed");
assert_eq!(result.response_code(), ResponseCode::NoError);
let mut record = record;
record.set_data(Some(RData::A(A::new(101, 11, 101, 11))));
let result = client
.append(record.clone(), origin.clone(), true)
@ -796,7 +791,6 @@ fn test_delete_all() {
.expect("create failed");
assert_eq!(result.response_code(), ResponseCode::NoError);
let mut record = record;
record.set_rr_type(RecordType::AAAA);
record.set_data(Some(RData::AAAA(AAAA::new(1, 2, 3, 4, 5, 6, 7, 8))));
let result = client