remove unneeded header clones

src/connection/mod.rs

@@ -244,7 +244,7 @@ pub trait ConnectionTrait: Sync + Debug {
         let fut = self.filter().one_kind(T::KIND);
         async move {
             let raw = fut.await.map_err(|_| NetworkError::EOF)?;
-            Ok((raw.header.clone(), raw.into_message()?))
+            raw.into_header_and_message()
         }
     }
 
@@ -258,7 +258,7 @@ pub trait ConnectionTrait: Sync + Debug {
     ) -> impl Stream<Item = Result<(NetMessageHeader, T)>> + 'static {
         BroadcastStream::new(self.filter().on_kind(T::KIND)).map(|raw| {
             let raw = raw.map_err(|_| NetworkError::EOF)?;
-            Ok((raw.header.clone(), raw.into_message()?))
+            raw.into_header_and_message()
         })
     }
 

src/net.rs

@@ -321,7 +321,7 @@ impl RawNetMessage {
 }
 
 impl RawNetMessage {
-    pub fn into_message<T: NetMessage>(self) -> Result<T> {
+    pub fn into_header_and_message<T: NetMessage>(self) -> Result<(NetMessageHeader, T)> {
         if let Some(result) = self.header.result {
             EResult::from_result(result)?;
         }
@@ -332,9 +332,13 @@ impl RawNetMessage {
                 self.data.len()
             );
             let body = T::read_body(self.data, &self.header)?;
-            Ok(body)
+            Ok((self.header, body))
         } else {
             Err(NetworkError::DifferentMessage(T::KIND.into(), self.kind))
         }
     }
+
+    pub fn into_message<T: NetMessage>(self) -> Result<T> {
+        self.into_header_and_message().map(|(_, msg)| msg)
+    }
 }