refactor(data): Consolidate From impls

epage · Apr 22, 2024 · bd2a858 · bd2a858
1 parent e1cadb3
commit bd2a858
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/crates/snapbox/src/data/mod.rs b/crates/snapbox/src/data/mod.rs
@@ -666,6 +666,13 @@ impl<'s> From<&'s str> for Data {
     }
 }
 
+impl From<Inline> for super::Data {
+    fn from(inline: Inline) -> Self {
+        let trimmed = inline.trimmed();
+        super::Data::text(trimmed).with_source(inline)
+    }
+}
+
 #[cfg(feature = "detect-encoding")]
 fn is_binary(data: &[u8]) -> bool {
     match content_inspector::inspect(data) {

diff --git a/crates/snapbox/src/data/source.rs b/crates/snapbox/src/data/source.rs
@@ -79,7 +79,7 @@ pub struct Inline {
 }
 
 impl Inline {
-    fn trimmed(&self) -> String {
+    pub(crate) fn trimmed(&self) -> String {
         let mut data = self.data;
         if data.contains('\n') {
             data = data.strip_prefix('\n').unwrap_or(data);
@@ -95,13 +95,6 @@ impl std::fmt::Display for Inline {
     }
 }
 
-impl From<Inline> for super::Data {
-    fn from(inline: Inline) -> Self {
-        let trimmed = inline.trimmed();
-        super::Data::text(trimmed).with_source(inline)
-    }
-}
-
 /// Position within Rust source code, see [`Inline`]
 #[doc(hidden)]
 #[derive(Clone, Debug, PartialEq, Eq)]