Fix new lints

RReverser · Aug 18, 2024 · 4e5240d · 4e5240d
1 parent 932534d
commit 4e5240d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/src/api/image_array/client.rs b/src/api/image_array/client.rs
@@ -97,7 +97,7 @@ impl Response for ASCOMResult<ImageArray> {
                 .map(|response| response.map(|response| response.map(|json| json.0)));
         }
         let metadata = bytes
-            .get(..std::mem::size_of::<ImageBytesMetadata>())
+            .get(..size_of::<ImageBytesMetadata>())
             .ok_or_else(|| eyre::eyre!("not enough bytes to read image metadata"))?;
         let metadata = bytemuck::pod_read_unaligned::<ImageBytesMetadata>(metadata);
         eyre::ensure!(
@@ -107,7 +107,7 @@ impl Response for ASCOMResult<ImageArray> {
         );
         let data_start = usize::try_from(metadata.data_start)?;
         eyre::ensure!(
-            data_start >= std::mem::size_of::<ImageBytesMetadata>(),
+            data_start >= size_of::<ImageBytesMetadata>(),
             "image data start offset is within metadata",
         );
         let data = bytes

diff --git a/src/api/image_array/server.rs b/src/api/image_array/server.rs
@@ -127,7 +127,7 @@ impl ImageArray {
             .iter()
             .filter_map(|value| value.to_str().ok())
             .flat_map(MediaTypeList::new)
-            .filter_map(std::result::Result::ok)
+            .filter_map(Result::ok)
             .any(|media_type| media_type.essence() == MEDIA_TYPE)
     }
 }
diff --git a/src/client/discovery.rs b/src/client/discovery.rs
@@ -42,7 +42,7 @@ pub struct BoundClient {
 impl BoundClient {
     #[tracing::instrument(level = "trace", skip_all, fields(%addr, intf.friendly_name = intf.friendly_name.as_ref(), intf.description = intf.description.as_ref(), ?intf.ipv4, ?intf.ipv6))]
     async fn send_discovery_msg(&self, addr: Ipv6Addr, intf: &Interface) {
-        match async {
+        let send_op = async {
             if addr.is_multicast() {
                 socket2::SockRef::from(&self.socket).set_multicast_if_v6(intf.index)?;
             }
@@ -52,9 +52,8 @@ impl BoundClient {
                 .send_to(DISCOVERY_MSG, (addr, self.client.discovery_port))
                 .await?;
             Ok::<_, std::io::Error>(())
-        }
-        .await
-        {
+        };
+        match send_op.await {
             Ok(()) => tracing::trace!("success"),
             Err(err) => tracing::warn!(%err),
         }

diff --git a/src/discovery.rs b/src/discovery.rs
@@ -49,7 +49,7 @@ pub(crate) async fn bind_socket(
             socket.as_raw_socket() as _,
             SIO_UDP_CONNRESET,
             std::ptr::addr_of!(input).cast(),
-            std::mem::size_of_val(&input) as _,
+            size_of_val(&input) as _,
             std::ptr::null_mut(),
             0,
             std::ptr::addr_of_mut!(output).cast(),

diff --git a/src/errors.rs b/src/errors.rs
@@ -159,7 +159,7 @@ macro_rules! ascom_error_codes {
 }
 
 ascom_error_codes! {
-    #[doc = ""]
+    #[doc = "Success"]
     OK = 0,
     #[doc = "The requested action is not implemented in this driver"]
     ACTION_NOT_IMPLEMENTED = 0x40C,

diff --git a/src/lib.rs b/src/lib.rs
@@ -331,7 +331,7 @@ Licensed under either of
     unused_macro_rules,
     unused_qualifications,
     unused_results,
-    unused_tuple_struct_fields
+    dead_code
 )]
 #![allow(
     clippy::module_name_repetitions,
@@ -377,7 +377,9 @@ pub use server::{BoundServer, Server};
 fn prepare_test_env() {
     use tracing_subscriber::prelude::*;
 
-    std::env::set_var("RUST_BACKTRACE", "full");
+    unsafe {
+        std::env::set_var("RUST_BACKTRACE", "full");
+    }
 
     tracing_subscriber::registry()
         .with(