fix Message::with_command, rename deprecation_errors

Author: patrickfreed

src/client/options/mod.rs

@@ -339,7 +339,6 @@ impl<'de> Deserialize<'de> for ServerApiVersion {
 #[serde_with::skip_serializing_none]
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, TypedBuilder)]
 #[builder(field_defaults(setter(into)))]
-#[serde(rename_all = "camelCase")]
 #[non_exhaustive]
 pub struct ServerApi {
     /// The declared API version.
@@ -356,6 +355,7 @@ pub struct ServerApi {
     /// deprecated from the declared API version is used.
     /// Note that at the time of this writing, no deprecations in version 1 exist.
     #[builder(default)]
+    #[serde(rename = "apiDeprecationErrors")]
     pub deprecation_errors: Option<bool>,
 }
 

src/cmap/conn/mod.rs

@@ -267,7 +267,7 @@ impl Connection {
         command: RawCommand,
         request_id: impl Into<Option<i32>>,
     ) -> Result<RawCommandResponse> {
-        let message = Message::with_raw_command(command, request_id.into())?;
+        let message = Message::with_raw_command(command, request_id.into());
         self.send_message(message).await
     }
 

src/cmap/conn/wire/message.rs

@@ -33,31 +33,29 @@ impl Message {
     /// Creates a `Message` from a given `Command`.
     ///
     /// Note that `response_to` will need to be set manually.
-    pub(crate) fn with_command(mut command: Command, request_id: Option<i32>) -> Result<Self> {
-        command.body.insert("$db", command.target_db);
-
-        let mut bytes = Vec::new();
-        command.body.to_writer(&mut bytes)?;
-        Ok(Self {
-            response_to: 0,
-            flags: MessageFlags::empty(),
-            sections: vec![MessageSection::Document(bytes)],
-            checksum: None,
+    pub(crate) fn with_command(command: Command, request_id: Option<i32>) -> Result<Self> {
+        let bytes = bson::to_vec(&command)?;
+        Ok(Self::with_raw_command(
+            RawCommand {
+                bytes,
+                target_db: command.target_db,
+                name: command.name,
+            },
             request_id,
-        })
+        ))
     }
 
     /// Creates a `Message` from a given `Command`.
     ///
     /// Note that `response_to` will need to be set manually.
-    pub(crate) fn with_raw_command(command: RawCommand, request_id: Option<i32>) -> Result<Self> {
-        Ok(Self {
+    pub(crate) fn with_raw_command(command: RawCommand, request_id: Option<i32>) -> Self {
+        Self {
             response_to: 0,
             flags: MessageFlags::empty(),
             sections: vec![MessageSection::Document(command.bytes)],
             checksum: None,
             request_id,
-        })
+        }
     }
 
     /// Gets the first document contained in this Message.