Merge

macros/src/protos.rs

@@ -177,7 +177,7 @@ impl RmcProtocolData {
             let deser_params =
                 fold_tokenable(parameters.iter().map(|(param_name, param_type, attribs)| {
                     let error_msg = LitStr::new(
-                        &format!("an error occurred whilest deserializing {}", param_name),
+                        &format!("an error occurred whilst deserializing {}", param_name),
                         Span::call_site(),
                     );
                     let return_from_deser_error = if self.has_returns {

prudpv1/src/prudp/socket.rs

@@ -659,7 +659,7 @@ impl<T: CryptoHandler> AnyInternalSocket for InternalSocket<T> {
                 if let Some(conn) = sender.as_ref() {
                     if let Err(e) = conn.send(packet).await {
                         error!(
-                            "error whilest sending data to connection establishment: {}",
+                            "error whilst sending data to connection establishment: {}",
                             e
                         );
                     }
@@ -707,22 +707,22 @@ impl<T: CryptoHandler> AnyInternalSocket for InternalSocket<T> {
                     let mut cursor = Cursor::new(&packet.payload);
 
                     let Ok(_substream_id): Result<u8, _> = cursor.read_le_struct() else {
-                        error!("invalid data whilest reading new version agregate acknowledgement");
+                        error!("invalid data whilst reading new version agregate acknowledgement");
                         return;
                     };
                     let Ok(additional_sequence_ids): Result<u8, _> = cursor.read_le_struct() else {
-                        error!("invalid data whilest reading new version agregate acknowledgement");
+                        error!("invalid data whilst reading new version agregate acknowledgement");
                         return;
                     };
                     let Ok(sequence_id): Result<u16, _> = cursor.read_le_struct() else {
-                        error!("invalid data whilest reading new version agregate acknowledgement");
+                        error!("invalid data whilst reading new version agregate acknowledgement");
                         return;
                     };
                     for _ in 0..additional_sequence_ids {
                         let Ok(additional_sequence_id): Result<u16, _> = cursor.read_le_struct()
                         else {
                             error!(
-                                "invalid data whilest reading new version agregate acknowledgement"
+                                "invalid data whilst reading new version agregate acknowledgement"
                             );
                             return;
                         };

rnex-core/src/executables/common.rs

@@ -139,7 +139,7 @@ where
             Ok(v) => v,
             Err(e) => {
                 error!(
-                    "an error ocurred whilest reading connection data buffer: {:?}",
+                    "an error ocurred whilst reading connection data buffer: {:?}",
                     e
                 );
                 continue;
@@ -151,7 +151,7 @@ where
         let user_connection_data = match user_connection_data {
             Ok(v) => v,
             Err(e) => {
-                error!("an error ocurred whilest reading connection data: {:?}", e);
+                error!("an error ocurred whilst reading connection data: {:?}", e);
                 continue;
             }
         };

rnex-core/src/executables/friends_backend.rs

@@ -31,7 +31,7 @@ pub async fn start_friends_backend() {
             Ok(v) => v,
             Err(e) => {
                 error!(
-                    "an error ocurred whilest reading connection data buffer: {:?}",
+                    "an error ocurred whilst reading connection data buffer: {:?}",
                     e
                 );
                 continue;
@@ -43,7 +43,7 @@ pub async fn start_friends_backend() {
         let c = match user_connection_data {
             Ok(v) => v,
             Err(e) => {
-                error!("an error ocurred whilest reading connection data: {:?}", e);
+                error!("an error ocurred whilst reading connection data: {:?}", e);
                 continue;
             }
         };

rnex-core/src/rmc/protocols/mod.rs

@@ -37,7 +37,7 @@ use tokio::time::{Instant, sleep, sleep_until};
 
 #[derive(Error, Debug)]
 pub enum RemoteCallError {
-    #[error("Call to remote timed out whilest waiting on response.")]
+    #[error("Call to remote timed out whilst waiting on response.")]
     Timeout,
     #[error("A server side rmc error occurred: {0:?}")]
     ServerError(ErrorCode),