Merge branch 'main' into rrdp-same-origin

Author: partim

src/repository/cert.rs

@@ -1656,10 +1656,7 @@ impl TbsCert {
                     "wrong AS resources extension for certificate policy"
                 ))
             }
-            let (v4_resources, v6_resources) = match ip_resources {
-                Some(res) => res,
-                None => (None, None)
-            };
+            let (v4_resources, v6_resources) = ip_resources.unwrap_or_default();
             let (ca_repository, rpki_manifest, signed_object, rpki_notify) = {
                 match sia {
                     Some(sia) => (

src/repository/rta.rs

@@ -1114,13 +1114,13 @@ impl CertResources {
 
     fn replace_inherited(&mut self, ca: &CertResources) {
         if self.as_resources.is_none() {
-            self.as_resources = ca.as_resources.clone()
+            self.as_resources.clone_from(&ca.as_resources)
         }
         if self.v4_resources.is_none() {
-            self.v4_resources = ca.v4_resources.clone()
+            self.v4_resources.clone_from(&ca.v4_resources)
         }
         if self.v6_resources.is_none() {
-            self.v6_resources = ca.v6_resources.clone()
+            self.v6_resources.clone_from(&ca.v6_resources)
         }
     }
 

src/resources/asn.rs

@@ -18,8 +18,8 @@ use bcder::decode::{self, DecodeError, Source};
 pub struct Asn(u32);
 
 impl Asn {
-    pub const MIN: Asn = Asn(std::u32::MIN);
-    pub const MAX: Asn = Asn(std::u32::MAX);
+    pub const MIN: Asn = Asn(u32::MIN);
+    pub const MAX: Asn = Asn(u32::MAX);
 
     /// Creates an AS number from a `u32`.
     pub fn from_u32(value: u32) -> Self {

src/rtr/client.rs

@@ -282,7 +282,7 @@ where
         self.sock.flush().await?;
         let start = match self.try_io(FirstReply::read).await? {
             FirstReply::Response(start) => start,
-            FirstReply::Reset(_) => {
+            FirstReply::Reset => {
                 self.state = None;
                 return Ok(None)
             }
@@ -457,7 +457,7 @@ enum FirstReply {
     Response(pdu::CacheResponse),
 
     /// A reset response. We need to retry with a reset query.
-    Reset(pdu::CacheReset),
+    Reset,
 }
 
 impl FirstReply {
@@ -478,7 +478,7 @@ impl FirstReply {
             pdu::CacheReset::PDU => {
                 pdu::CacheReset::read_payload(
                     header, sock
-                ).await.map(FirstReply::Reset)
+                ).await.map(|_| FirstReply::Reset)
             }
             pdu::Error::PDU => {
                 Err(io::Error::new(