fix: fix test and clippy

Author: 4t145

crates/rmcp/src/model/extension.rs

@@ -1,6 +1,6 @@
 //! Copied from http
 //!
-//! source: https://github.com/hyperium/http/blob/master/src/extensions.rs
+//! source: <https://github.com/hyperium/http/blob/master/src/extensions.rs>
 
 use std::{
     any::{Any, TypeId},

crates/rmcp/src/model/serde_impl.rs

@@ -4,12 +4,12 @@ use serde::{Deserialize, Serialize};
 
 use super::{Extensions, Meta, Notification, NotificationNoParam, Request, RequestNoParam};
 
-// serde helper type
 #[derive(Serialize, Deserialize)]
-struct WithMeta<'a, T> {
+struct WithMeta<'a, M, P> {
+    method: M,
+    params: P,
+    #[serde(skip_serializing_if = "Option::is_none")]
     _meta: Option<Cow<'a, Meta>>,
-    #[serde(flatten)]
-    _rest: T,
 }
 
 impl<M, R> Serialize for Request<M, R>
@@ -23,8 +23,14 @@ where
     {
         let extensions = &self.extensions;
         let _meta = extensions.get::<Meta>().map(Cow::Borrowed);
-        let body = WithMeta { _meta, _rest: self };
-        WithMeta::serialize(&body, serializer)
+        WithMeta::serialize(
+            &WithMeta {
+                method: &self.method,
+                params: &self.params,
+                _meta,
+            },
+            serializer,
+        )
     }
 }
 
@@ -45,11 +51,19 @@ where
         }
         Ok(Request {
             extensions,
-            ..body._rest
+            method: body.method,
+            params: body.params,
         })
     }
 }
 
+#[derive(Serialize, Deserialize)]
+struct NoParamWithMeta<'a, M> {
+    method: M,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    _meta: Option<Cow<'a, Meta>>,
+}
+
 impl<M> Serialize for RequestNoParam<M>
 where
     M: Serialize,
@@ -60,8 +74,13 @@ where
     {
         let extensions = &self.extensions;
         let _meta = extensions.get::<Meta>().map(Cow::Borrowed);
-        let body = WithMeta { _meta, _rest: self };
-        WithMeta::serialize(&body, serializer)
+        NoParamWithMeta::serialize(
+            &NoParamWithMeta {
+                method: &self.method,
+                _meta,
+            },
+            serializer,
+        )
     }
 }
 
@@ -73,15 +92,15 @@ where
     where
         D: serde::Deserializer<'de>,
     {
-        let body = WithMeta::deserialize(deserializer)?;
+        let body = NoParamWithMeta::deserialize(deserializer)?;
         let _meta = body._meta.map(|m| m.into_owned());
         let mut extensions = Extensions::new();
         if let Some(meta) = _meta {
             extensions.insert(meta);
         }
         Ok(RequestNoParam {
             extensions,
-            ..body._rest
+            method: body.method,
         })
     }
 }
@@ -97,8 +116,14 @@ where
     {
         let extensions = &self.extensions;
         let _meta = extensions.get::<Meta>().map(Cow::Borrowed);
-        let body = WithMeta { _meta, _rest: self };
-        WithMeta::serialize(&body, serializer)
+        WithMeta::serialize(
+            &WithMeta {
+                method: &self.method,
+                params: &self.params,
+                _meta,
+            },
+            serializer,
+        )
     }
 }
 
@@ -119,7 +144,8 @@ where
         }
         Ok(Notification {
             extensions,
-            ..body._rest
+            method: body.method,
+            params: body.params,
         })
     }
 }
@@ -134,8 +160,13 @@ where
     {
         let extensions = &self.extensions;
         let _meta = extensions.get::<Meta>().map(Cow::Borrowed);
-        let body = WithMeta { _meta, _rest: self };
-        WithMeta::serialize(&body, serializer)
+        NoParamWithMeta::serialize(
+            &NoParamWithMeta {
+                method: &self.method,
+                _meta,
+            },
+            serializer,
+        )
     }
 }
 
@@ -147,15 +178,15 @@ where
     where
         D: serde::Deserializer<'de>,
     {
-        let body = WithMeta::deserialize(deserializer)?;
+        let body = NoParamWithMeta::deserialize(deserializer)?;
         let _meta = body._meta.map(|m| m.into_owned());
         let mut extensions = Extensions::new();
         if let Some(meta) = _meta {
             extensions.insert(meta);
         }
         Ok(NotificationNoParam {
             extensions,
-            ..body._rest
+            method: body.method,
         })
     }
 }