refactor: add partial_pub_fields clippy style and readability lint (#976)

Author: RRRadicalEdward

Cargo.toml

@@ -127,6 +127,7 @@ empty_enum_variants_with_brackets = "warn"
 deref_by_slicing = "warn"
 multiple_inherent_impl = "warn"
 map_with_unused_argument_over_ranges = "warn"
+partial_pub_fields = "warn"
 trait_duplication_in_bounds = "warn"
 type_repetition_in_bounds = "warn"
 checked_conversions = "warn"

crates/ironrdp-acceptor/src/connection.rs

@@ -713,7 +713,7 @@ impl Sequence for Acceptor {
                     AcceptorState::Accepted {
                         channels,
                         client_capabilities,
-                        input_events: finalization.input_events,
+                        input_events: finalization.into_input_events(),
                     }
                 } else {
                     AcceptorState::ConnectionFinalization {

crates/ironrdp-acceptor/src/finalization.rs

@@ -12,7 +12,7 @@ pub struct FinalizationSequence {
     user_channel_id: u16,
     io_channel_id: u16,
 
-    pub input_events: Vec<Vec<u8>>,
+    input_events: Vec<Vec<u8>>,
 }
 
 #[derive(Default, Debug)]
@@ -190,6 +190,10 @@ impl FinalizationSequence {
         }
     }
 
+    pub fn into_input_events(self) -> Vec<Vec<u8>> {
+        self.input_events
+    }
+
     pub fn is_done(&self) -> bool {
         self.state.is_terminal()
     }

crates/ironrdp-client/src/rdp.rs

@@ -660,7 +660,7 @@ async fn active_session(
                             desktop_size,
                             enable_server_pointer,
                             pointer_software_rendering,
-                        } = connection_activation.state
+                        } = connection_activation.connection_activation_state()
                         {
                             debug!(?desktop_size, "Deactivation-Reactivation Sequence completed");
                             // Update image size with the new desktop size.

crates/ironrdp-cliprdr/src/pdu/format_data/metafile.rs

@@ -42,7 +42,7 @@ pub struct PackedMetafile<'a> {
     pub x_ext: u32,
     pub y_ext: u32,
     /// The variable sized contents of the metafile as specified in [MS-WMF] section 2
-    data: Cow<'a, [u8]>,
+    pub data: Cow<'a, [u8]>,
 }
 
 impl PackedMetafile<'_> {
@@ -62,10 +62,6 @@ impl PackedMetafile<'_> {
             data: data.into(),
         }
     }
-
-    pub fn data(&self) -> &[u8] {
-        &self.data
-    }
 }
 
 impl Encode for PackedMetafile<'_> {

crates/ironrdp-connector/src/connection.rs

@@ -553,7 +553,7 @@ impl Sequence for ClientConnector {
                 mut connection_activation,
             } => {
                 let written = connection_activation.step(input, output)?;
-                match connection_activation.state {
+                match connection_activation.connection_activation_state() {
                     ConnectionActivationState::ConnectionFinalization { .. } => (
                         written,
                         ClientConnectorState::ConnectionFinalization { connection_activation },
@@ -570,10 +570,10 @@ impl Sequence for ClientConnector {
             } => {
                 let written = connection_activation.step(input, output)?;
 
-                let next_state = if !connection_activation.state.is_terminal() {
+                let next_state = if !connection_activation.connection_activation_state().is_terminal() {
                     ClientConnectorState::ConnectionFinalization { connection_activation }
                 } else {
-                    match connection_activation.state {
+                    match connection_activation.connection_activation_state() {
                         ConnectionActivationState::Finalized {
                             io_channel_id,
                             user_channel_id,

crates/ironrdp-connector/src/connection_activation.rs

@@ -22,7 +22,7 @@ use crate::{
 /// [Server Deactivate All PDU]: https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-rdpbcgr/8a29971a-df3c-48da-add2-8ed9a05edc89
 #[derive(Debug, Clone)]
 pub struct ConnectionActivationSequence {
-    pub state: ConnectionActivationState,
+    state: ConnectionActivationState,
     config: Config,
 }
 
@@ -37,6 +37,11 @@ impl ConnectionActivationSequence {
         }
     }
 
+    /// Returns the current state as a district type, rather than `&dyn State` provided by [`Self::state`].
+    pub fn connection_activation_state(&self) -> ConnectionActivationState {
+        self.state
+    }
+
     #[must_use]
     pub fn reset_clone(&self) -> Self {
         self.clone().reset()
@@ -215,7 +220,7 @@ impl Sequence for ConnectionActivationSequence {
     }
 }
 
-#[derive(Default, Debug, Clone)]
+#[derive(Default, Debug, Copy, Clone)]
 pub enum ConnectionActivationState {
     #[default]
     Consumed,

crates/ironrdp-connector/src/connection_finalization.rs

@@ -9,7 +9,7 @@ use tracing::{debug, warn};
 
 use crate::{general_err, legacy, reason_err, ConnectorResult, Sequence, State, Written};
 
-#[derive(Default, Debug, Clone)]
+#[derive(Default, Debug, Copy, Clone)]
 #[non_exhaustive]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 pub enum ConnectionFinalizationState {
@@ -48,7 +48,7 @@ impl State for ConnectionFinalizationState {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Copy, Clone)]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 pub struct ConnectionFinalizationSequence {
     pub state: ConnectionFinalizationState,

crates/ironrdp-connector/src/lib.rs

@@ -406,7 +406,7 @@ pub trait ConnectorResultExt {
 impl<T> ConnectorResultExt for ConnectorResult<T> {
     fn with_context(self, context: &'static str) -> Self {
         self.map_err(|mut e| {
-            e.context = context;
+            e.set_context(context);
             e
         })
     }

crates/ironrdp-dvc/src/client.rs

@@ -116,8 +116,8 @@ impl SvcProcessor for DrdynvcClient {
             }
             DrdynvcServerPdu::Create(create_request) => {
                 debug!("Got DVC Create Request PDU: {create_request:?}");
-                let channel_name = create_request.channel_name;
-                let channel_id = create_request.channel_id;
+                let channel_id = create_request.channel_id();
+                let channel_name = create_request.into_channel_name();
 
                 if !self.cap_handshake_done {
                     debug!(
@@ -156,9 +156,9 @@ impl SvcProcessor for DrdynvcClient {
             }
             DrdynvcServerPdu::Close(close_request) => {
                 debug!("Got DVC Close Request PDU: {close_request:?}");
-                self.dynamic_channels.remove_by_channel_id(close_request.channel_id);
+                self.dynamic_channels.remove_by_channel_id(close_request.channel_id());
 
-                let close_response = DrdynvcClientPdu::Close(ClosePdu::new(close_request.channel_id));
+                let close_response = DrdynvcClientPdu::Close(ClosePdu::new(close_request.channel_id()));
 
                 debug!("Send DVC Close Response PDU: {close_response:?}");
                 responses.push(SvcMessage::from(close_response));