public iterator method

Author: abr-egn

src/de/raw.rs

@@ -71,7 +71,7 @@ impl<'de> Deserializer<'de> {
         V: serde::de::Visitor<'de>,
     {
         if self.options.utf8_lossy {
-            if let Some(lossy) = self.element.value_utf8_lossy()? {
+            if let Some(lossy) = self.element.value_utf8_lossy_inner()? {
                 return match lossy {
                     Utf8LossyBson::String(s) => visitor.visit_string(s),
                     Utf8LossyBson::RegularExpression(re) => {
@@ -178,7 +178,7 @@ impl<'de> Deserializer<'de> {
 
     fn get_string(&self) -> Result<Cow<'de, str>> {
         if self.options.utf8_lossy {
-            let value = self.element.value_utf8_lossy()?;
+            let value = self.element.value_utf8_lossy_inner()?;
             let s = match value {
                 Some(Utf8LossyBson::String(s)) => s,
                 _ => {

src/raw/document.rs

@@ -10,7 +10,6 @@ use crate::{
     error::{Error, Result},
     raw::{error::ErrorKind, serde::OwnedOrBorrowedRawDocument, RAW_DOCUMENT_NEWTYPE},
     DateTime,
-    RawBson,
     Timestamp,
 };
 
@@ -535,14 +534,7 @@ impl RawDocument {
     pub fn to_document_utf8_lossy(&self) -> Result<Document> {
         self.iter_elements()
             .map(|res| {
-                res.and_then(|e| {
-                    let key = e.key().to_owned();
-                    let raw_value: RawBson = match e.value_utf8_lossy()? {
-                        Some(l) => l.into(),
-                        None => e.value()?.to_raw_bson(),
-                    };
-                    Ok((key, raw_value.try_into()?))
-                })
+                res.and_then(|e| Ok((e.key().to_owned(), e.value_utf8_lossy()?.try_into()?)))
             })
             .collect()
     }

src/raw/iter.rs

@@ -266,7 +266,14 @@ impl<'a> RawElement<'a> {
         })
     }
 
-    pub(crate) fn value_utf8_lossy(&self) -> Result<Option<Utf8LossyBson<'a>>> {
+    pub fn value_utf8_lossy(&self) -> Result<RawBson> {
+        match self.value_utf8_lossy_inner()? {
+            Some(v) => Ok(v.into()),
+            None => Ok(self.value()?.to_raw_bson()),
+        }
+    }
+
+    pub(crate) fn value_utf8_lossy_inner(&self) -> Result<Option<Utf8LossyBson<'a>>> {
         Ok(Some(match self.kind {
             ElementType::String => Utf8LossyBson::String(self.read_utf8_lossy()),
             ElementType::JavaScriptCode => Utf8LossyBson::JavaScriptCode(self.read_utf8_lossy()),