Skip to content

Commit 7fd393e

Browse files
authored
RUST-1998 Remove now-redundant to_document_utf8_lossy method (#592)
1 parent e13a588 commit 7fd393e

File tree

3 files changed

+13
-24
lines changed

3 files changed

+13
-24
lines changed

src/raw/document.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -498,18 +498,6 @@ impl RawDocument {
498498
let s = try_to_str(bytes)?;
499499
s.try_into()
500500
}
501-
502-
/// Copy this into a [`Document`], returning an error if invalid BSON is encountered. Any
503-
/// invalid UTF-8 sequences will be replaced with the Unicode replacement character.
504-
pub fn to_document_utf8_lossy(&self) -> RawResult<Document> {
505-
let mut out = Document::new();
506-
for elem in self.iter_elements() {
507-
let elem = elem?;
508-
let value = deep_utf8_lossy(elem.value_utf8_lossy()?)?;
509-
out.insert(elem.key().as_str(), value);
510-
}
511-
Ok(out)
512-
}
513501
}
514502

515503
#[cfg(feature = "serde")]

src/tests/modules/serializer_deserializer.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use crate::{
2121
RawDocumentBuf,
2222
Regex,
2323
Timestamp,
24+
Utf8Lossy,
2425
};
2526
use serde_json::json;
2627

@@ -74,11 +75,11 @@ fn test_encode_decode_utf8_string_invalid() {
7475
doc.to_writer(&mut buf).unwrap();
7576

7677
let expected = doc! { "key": "��", "subdoc": { "subkey": "��" } };
77-
let decoded = RawDocumentBuf::from_reader(&mut Cursor::new(buf))
78+
let decoded: Utf8Lossy<Document> = RawDocumentBuf::from_reader(&mut Cursor::new(buf))
7879
.unwrap()
79-
.to_document_utf8_lossy()
80+
.try_into()
8081
.unwrap();
81-
assert_eq!(decoded, expected);
82+
assert_eq!(decoded.0, expected);
8283
}
8384

8485
#[test]

src/tests/spec/corpus.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -562,15 +562,15 @@ fn run_test(test: TestFile) {
562562
.expect_err(description.as_str());
563563

564564
if decode_error.description.contains("invalid UTF-8") {
565-
RawDocumentBuf::from_reader(bson.as_slice())
566-
.expect(&description)
567-
.to_document_utf8_lossy()
568-
.unwrap_or_else(|err| {
569-
panic!(
570-
"{}: utf8_lossy should not fail (failed with {:?})",
571-
description, err
572-
)
573-
});
565+
Utf8Lossy::<Document>::try_from(
566+
RawDocumentBuf::from_reader(bson.as_slice()).expect(&description),
567+
)
568+
.unwrap_or_else(|err| {
569+
panic!(
570+
"{}: utf8_lossy should not fail (failed with {:?})",
571+
description, err
572+
)
573+
});
574574
crate::deserialize_from_slice::<Utf8Lossy<Document>>(bson.as_slice())
575575
.expect(&description);
576576
}

0 commit comments

Comments
 (0)