Remove structs

Author: Zibi Braniecki

src/structs/display_list.rs renamed to src/display_list.rs

@@ -61,7 +61,7 @@
 //!     DisplayLine::EmptySource
 //! ]);
 //! ```
-use structs::snippet::{AnnotationType, Snippet};
+use snippet::{AnnotationType, Snippet};
 
 pub struct DisplayList {
     pub body: Vec<DisplayLine>,

src/display_list_formatting.rs

@@ -1,17 +1,13 @@
-use structs::display_list::{DisplayAnnotationType, DisplayLine, DisplayMark,
+use std::fmt;
+use display_list::{DisplayAnnotationType, DisplayLine, DisplayMark,
                             DisplaySnippetType};
 
 pub trait DisplayListFormatting {
-    fn format_snippet_type(snippet_type: &DisplaySnippetType) -> String {
-        match snippet_type {
-            DisplaySnippetType::Error => "error".to_string(),
-            DisplaySnippetType::Warning => "warning".to_string(),
-        }
-    }
+    fn format_snippet_type(snippet_type: &DisplaySnippetType) -> String;
 
     fn format_inline_marks(inline_marks: &[DisplayMark], inline_marks_width: usize) -> String {
         format!(
-            "{: >width$}",
+            "{:>width$}",
             inline_marks
                 .iter()
                 .map(|mark| match mark {
@@ -25,7 +21,7 @@ pub trait DisplayListFormatting {
     }
 
     fn format_annotation_content(
-        range: (usize, usize),
+        range: &(usize, usize),
         label: &Option<String>,
         annotation_type: &DisplayAnnotationType,
     ) -> String {
@@ -58,28 +54,28 @@ pub trait DisplayListFormatting {
         }
     }
 
-    fn format_line(dl: DisplayLine, lineno_width: usize, inline_marks_width: usize) -> String {
+    fn format_line(f: &mut fmt::Formatter, dl: &DisplayLine, lineno_width: usize, inline_marks_width: usize) -> fmt::Result {
         match dl {
             DisplayLine::Description {
                 snippet_type,
                 id,
                 label,
-            } => format!(
+            } => writeln!(f,
                 "{}[{}]: {}",
                 Self::format_snippet_type(&snippet_type),
                 id,
                 label
             ),
             DisplayLine::Origin { path, row, col } => {
-                format!("{}--> {}:{}:{}", " ".repeat(lineno_width), path, row, col)
+                writeln!(f, "{}--> {}:{}:{}", " ".repeat(lineno_width), path, row, col)
             }
-            DisplayLine::EmptySource => format!("{} |", " ".repeat(lineno_width)),
+            DisplayLine::EmptySource => writeln!(f, "{} |", " ".repeat(lineno_width)),
             DisplayLine::Source {
                 lineno,
                 inline_marks,
                 content,
                 ..
-            } => format!(
+            } => writeln!(f,
                 "{:>width$} |{} {}",
                 lineno,
                 Self::format_inline_marks(&inline_marks, inline_marks_width),
@@ -91,46 +87,13 @@ pub trait DisplayListFormatting {
                 range,
                 label,
                 annotation_type,
-            } => format!(
+            } => writeln!(f,
                 "{} |{}{}",
                 " ".repeat(lineno_width),
                 Self::format_inline_marks(&inline_marks, inline_marks_width),
                 Self::format_annotation_content(range, &label, &annotation_type),
             ),
-            DisplayLine::Fold => format!("...  |",),
+            DisplayLine::Fold => writeln!(f, "...  |",),
         }
     }
 }
-
-// impl fmt::Display for DisplayList {
-//     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-//         let lineno_width = self.body.iter().fold(0, |max, line| match line {
-//             DisplayLine::Source { lineno, .. } => {
-//                 let width = lineno.to_string().len();
-//                 if width > max {
-//                     width
-//                 } else {
-//                     max
-//                 }
-//             }
-//             _ => max,
-//         });
-//         let inline_marks_width = self.body.iter().fold(0, |max, line| match line {
-//             DisplayLine::Source { inline_marks, .. } => {
-//                 let width = inline_marks.len();
-//                 if width > max {
-//                     width + 1
-//                 } else {
-//                     max
-//                 }
-//             }
-//             _ => max,
-//         });
-//         let body = self.body
-//             .clone()
-//             .into_iter()
-//             .map(|line| Formatter::format_line(line, lineno_width, inline_marks_width))
-//             .collect::<Vec<String>>();
-//         write!(f, "{}", body.join("\n"))
-//     }
-// }

src/format.rs

@@ -1,10 +1,17 @@
 use std::fmt;
-use structs::display_list::{DisplayLine, DisplayList};
+use display_list::{DisplayLine, DisplayList, DisplaySnippetType};
 use display_list_formatting::DisplayListFormatting;
 
 struct Formatter {}
 
-impl DisplayListFormatting for Formatter {}
+impl DisplayListFormatting for Formatter {
+    fn format_snippet_type(snippet_type: &DisplaySnippetType) -> String {
+        match snippet_type {
+            DisplaySnippetType::Error => "error".to_string(),
+            DisplaySnippetType::Warning => "warning".to_string(),
+        }
+    }
+}
 
 impl fmt::Display for DisplayList {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -30,11 +37,10 @@ impl fmt::Display for DisplayList {
             }
             _ => max,
         });
-        let body = self.body
-            .clone()
-            .into_iter()
-            .map(|line| Formatter::format_line(line, lineno_width, inline_marks_width))
-            .collect::<Vec<String>>();
-        write!(f, "{}", body.join("\n"))
+        
+        for line in &self.body {
+            Formatter::format_line(f, line, lineno_width, inline_marks_width)?;
+        }
+        Ok(())
     }
 }

src/lib.rs

@@ -25,9 +25,7 @@
 //! In order to produce such output, the user builds a
 //! [Snippet](self::snippet::Snippet) which has a single public method: `format`.
 
-mod structs;
-
-pub use structs::display_list;
-pub use structs::snippet;
 pub mod format;
 pub mod display_list_formatting;
+pub mod display_list;
+pub mod snippet;

src/structs/snippet.rs renamed to src/snippet.rs

@@ -46,11 +46,11 @@ fn test_fixtures() {
 
         let actual_out = format!("{}", DisplayList::from(snippet));
         println!("{}", expected_out);
-        println!("{}", actual_out);
+        println!("{}", actual_out.trim_right());
 
         assert_eq!(
             expected_out,
-            actual_out,
+            actual_out.trim_right(),
             "\n\n\nWhile parsing: {}\nThe diff is:\n\n\n{}\n\n\n",
             path_in,
             diff::get_diff(expected_out.as_str(), actual_out.as_str())