shift recursion to doc conversion

Author: abr-egn

src/raw/document.rs

@@ -8,7 +8,11 @@ use serde::{ser::SerializeMap, Deserialize, Serialize};
 use crate::{
     de::MIN_BSON_DOCUMENT_SIZE,
     raw::{error::ErrorKind, serde::OwnedOrBorrowedRawDocument, RAW_DOCUMENT_NEWTYPE},
+    Bson,
     DateTime,
+    JavaScriptCodeWithScope,
+    RawBson,
+    RawJavaScriptCodeWithScope,
     Timestamp,
 };
 
@@ -540,11 +544,45 @@ impl RawDocument {
     /// Copy this into a [`Document`], returning an error if invalid BSON is encountered.  Any
     /// invalid UTF-8 sequences will be replaced with the Unicode replacement character.
     pub fn to_document_utf8_lossy(&self) -> Result<Document> {
-        self.iter_elements()
-            .map(|res| {
-                res.and_then(|e| Ok((e.key().to_owned(), e.value_utf8_lossy()?.try_into()?)))
-            })
-            .collect()
+        let mut out = Document::new();
+        for elem in self.iter_elements() {
+            let elem = elem?;
+            let value = deep_utf8_lossy(elem.value_utf8_lossy()?)?;
+            out.insert(elem.key(), value);
+        }
+        Ok(out)
+    }
+}
+
+fn deep_utf8_lossy(src: RawBson) -> Result<Bson> {
+    match src {
+        RawBson::Array(arr) => {
+            let mut tmp = vec![];
+            for elem in arr.iter_elements() {
+                tmp.push(deep_utf8_lossy(elem?.value_utf8_lossy()?)?);
+            }
+            Ok(Bson::Array(tmp))
+        }
+        RawBson::Document(doc) => {
+            let mut tmp = doc! {};
+            for elem in doc.iter_elements() {
+                let elem = elem?;
+                tmp.insert(elem.key(), deep_utf8_lossy(elem.value_utf8_lossy()?)?);
+            }
+            Ok(Bson::Document(tmp))
+        }
+        RawBson::JavaScriptCodeWithScope(RawJavaScriptCodeWithScope { code, scope }) => {
+            let mut tmp = doc! {};
+            for elem in scope.iter_elements() {
+                let elem = elem?;
+                tmp.insert(elem.key(), deep_utf8_lossy(elem.value_utf8_lossy()?)?);
+            }
+            Ok(Bson::JavaScriptCodeWithScope(JavaScriptCodeWithScope {
+                code,
+                scope: tmp,
+            }))
+        }
+        v => v.try_into(),
     }
 }
 

src/raw/iter.rs

@@ -9,11 +9,9 @@ use crate::{
     DateTime,
     Decimal128,
     RawArray,
-    RawArrayBuf,
     RawBinaryRef,
     RawBson,
     RawDbPointerRef,
-    RawDocumentBuf,
     RawJavaScriptCodeWithScopeRef,
     RawRegexRef,
     Timestamp,
@@ -270,41 +268,8 @@ impl<'a> RawElement<'a> {
 
     pub fn value_utf8_lossy(&self) -> Result<RawBson> {
         match self.value_utf8_lossy_inner()? {
-            Some(v) => Ok(match v {
-                Utf8LossyBson::JavaScriptCodeWithScope(Utf8LossyJavaScriptCodeWithScope {
-                    code,
-                    scope,
-                }) => {
-                    let mut tmp = RawDocumentBuf::new();
-                    for elem in scope.iter_elements() {
-                        let elem = elem?;
-                        tmp.append(elem.key(), elem.value_utf8_lossy()?);
-                    }
-                    RawBson::JavaScriptCodeWithScope(super::RawJavaScriptCodeWithScope {
-                        code,
-                        scope: tmp,
-                    })
-                }
-                v => v.into(),
-            }),
-            None => Ok(match self.value()? {
-                RawBsonRef::Array(arr) => {
-                    let mut tmp = RawArrayBuf::new();
-                    for elem in arr.iter_elements() {
-                        tmp.push(elem?.value_utf8_lossy()?);
-                    }
-                    RawBson::Array(tmp)
-                }
-                RawBsonRef::Document(doc) => {
-                    let mut tmp = RawDocumentBuf::new();
-                    for elem in doc.iter_elements() {
-                        let elem = elem?;
-                        tmp.append(elem.key(), elem.value_utf8_lossy()?);
-                    }
-                    RawBson::Document(tmp)
-                }
-                v => v.to_raw_bson(),
-            }),
+            Some(v) => Ok(v.into()),
+            None => Ok(self.value()?.to_raw_bson()),
         }
     }