RUST-1998 Update driver to match lossy utf8 api changes (#1395)

Author: abr-egn

Cargo.lock

@@ -209,16 +209,6 @@ impl RawCommandResponse {
         })
     }
 
-    /// Used to handle decoding responses where the server may return invalid UTF-8 in error
-    /// messages.
-    pub(crate) fn body_utf8_lossy<'a, T: Deserialize<'a>>(&'a self) -> Result<T> {
-        crate::bson::from_slice_utf8_lossy(self.raw.as_bytes()).map_err(|e| {
-            Error::from(ErrorKind::InvalidResponse {
-                message: format!("{}", e),
-            })
-        })
-    }
-
     pub(crate) fn raw_body(&self) -> &RawDocument {
         &self.raw
     }

src/cmap/conn/command.rs

@@ -433,21 +433,41 @@ impl WriteConcernOnlyBody {
     }
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
 pub(crate) struct WriteResponseBody<T = SingleWriteBody> {
-    #[serde(flatten)]
     body: T,
-
-    #[serde(rename = "writeErrors")]
     write_errors: Option<Vec<IndexedWriteError>>,
-
-    #[serde(rename = "writeConcernError")]
     write_concern_error: Option<WriteConcernError>,
-
-    #[serde(rename = "errorLabels")]
     labels: Option<Vec<String>>,
 }
 
+impl<'de, T: Deserialize<'de>> Deserialize<'de> for WriteResponseBody<T> {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        use bson::serde_helpers::Utf8LossyDeserialization;
+        #[derive(Deserialize)]
+        struct Helper<T> {
+            #[serde(flatten)]
+            body: T,
+            #[serde(rename = "writeErrors")]
+            write_errors: Option<Utf8LossyDeserialization<Vec<IndexedWriteError>>>,
+            #[serde(rename = "writeConcernError")]
+            write_concern_error: Option<Utf8LossyDeserialization<WriteConcernError>>,
+            #[serde(rename = "errorLabels")]
+            labels: Option<Vec<String>>,
+        }
+        let helper = Helper::deserialize(deserializer)?;
+        Ok(Self {
+            body: helper.body,
+            write_errors: helper.write_errors.map(|l| l.0),
+            write_concern_error: helper.write_concern_error.map(|l| l.0),
+            labels: helper.labels,
+        })
+    }
+}
+
 impl<T> WriteResponseBody<T> {
     fn validate(&self) -> Result<()> {
         if self.write_errors.is_none() && self.write_concern_error.is_none() {

src/operation.rs

@@ -133,7 +133,7 @@ impl OperationWithDefaults for Insert<'_> {
         response: RawCommandResponse,
         _context: ExecutionContext<'b>,
     ) -> Result<Self::O> {
-        let response: WriteResponseBody = response.body_utf8_lossy()?;
+        let response: WriteResponseBody = response.body()?;
         let response_n = Checked::<usize>::try_from(response.n)?;
 
         let mut map = HashMap::new();

src/operation/insert.rs

@@ -173,7 +173,7 @@ impl OperationWithDefaults for Update {
         response: RawCommandResponse,
         _context: ExecutionContext<'a>,
     ) -> Result<Self::O> {
-        let response: WriteResponseBody<UpdateBody> = response.body_utf8_lossy()?;
+        let response: WriteResponseBody<UpdateBody> = response.body()?;
         response.validate().map_err(convert_insert_many_error)?;
 
         let modified_count = response.n_modified;