New upstream version 0.66.0

[cargo.git] / vendor / snapbox / src / path.rs

diff --git a/vendor/snapbox/src/path.rs b/vendor/snapbox/src/path.rs
index 691152de60dbdce23a5560fe7a8c7bc66873bc8d..2d787bc8b1949449d26bcaf8cfb593457acfaa17 100644 (file)
--- a/vendor/snapbox/src/path.rs
+++ b/vendor/snapbox/src/path.rs
@@ -181,9 +181,10 @@ impl PathDiff {
                     let expected = crate::Data::read_from(&expected_path, None)
                         .map(|d| d.map_text(crate::utils::normalize_lines))
                         .map_err(Self::Failure)?;
-                    if expected.as_str().is_some() {
-                        actual = actual.try_text().map_text(crate::utils::normalize_lines);
-                    }
+
+                    actual = actual
+                        .try_coerce(expected.format())
+                        .map_text(crate::utils::normalize_lines);
 
                     if expected != actual {
                         return Err(Self::ContentMismatch {
@@ -258,9 +259,10 @@ impl PathDiff {
                     let expected = crate::Data::read_from(&expected_path, None)
                         .map(|d| d.map_text(crate::utils::normalize_lines))
                         .map_err(Self::Failure)?;
-                    if let Some(expected) = expected.as_str() {
+
+                    if let (Some(expected), format) = (expected.as_str(), expected.format()) {
                         actual = actual
-                            .try_text()
+                            .try_coerce(format)
                             .map_text(crate::utils::normalize_text)
                             .map_text(|t| substitutions.normalize(t, expected));
                     }