Remove main annotation pos

Author: Zibi Braniecki

src/format.rs

@@ -3,6 +3,32 @@ use structs::display_list::{DisplayAnnotationType, DisplayLine, DisplayList, Dis
                             DisplaySnippetType};
 use structs::formatted_display_list::{FormattedDisplayLine, FormattedDisplayList};
 
+struct DisplayListFormatting {}
+
+impl DisplayListFormatting {
+    fn format_snippet_type(snippet_type: &DisplaySnippetType) -> String {
+        match snippet_type {
+            DisplaySnippetType::Error => "error".to_string(),
+            DisplaySnippetType::Warning => "warning".to_string(),
+        }
+    }
+
+    fn format_inline_marks(inline_marks: &[DisplayMark], inline_marks_width: usize) -> String {
+        format!(
+            "{: >width$}",
+            inline_marks
+                .iter()
+                .map(|mark| match mark {
+                    DisplayMark::AnnotationThrough => "|",
+                    DisplayMark::AnnotationStart => "/",
+                })
+                .collect::<Vec<&str>>()
+                .join(""),
+            width = inline_marks_width
+        )
+    }
+}
+
 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 {
@@ -59,7 +85,7 @@ impl FormattedDisplayLine {
                 label,
             } => FormattedDisplayLine::Raw(format!(
                 "{}[{}]: {}",
-                Self::format_snippet_type(&snippet_type),
+                DisplayListFormatting::format_snippet_type(&snippet_type),
                 id,
                 label
             )),
@@ -80,7 +106,7 @@ impl FormattedDisplayLine {
                 ..
             } => FormattedDisplayLine::Source {
                 lineno: format!("{: >width$}", lineno, width = lineno_width),
-                inline_marks: Self::format_inline_marks(&inline_marks, inline_marks_width),
+                inline_marks: DisplayListFormatting::format_inline_marks(&inline_marks, inline_marks_width),
                 content,
             },
             DisplayLine::Annotation {
@@ -90,35 +116,13 @@ impl FormattedDisplayLine {
                 annotation_type,
             } => FormattedDisplayLine::Annotation {
                 lineno: " ".repeat(lineno_width),
-                inline_marks: Self::format_inline_marks(&inline_marks, inline_marks_width),
+                inline_marks: DisplayListFormatting::format_inline_marks(&inline_marks, inline_marks_width),
                 content: Self::format_annotation_content(range, &label, &annotation_type),
             },
             DisplayLine::Fold => FormattedDisplayLine::Fold,
         }
     }
 
-    fn format_snippet_type(snippet_type: &DisplaySnippetType) -> String {
-        match snippet_type {
-            DisplaySnippetType::Error => "error".to_string(),
-            DisplaySnippetType::Warning => "warning".to_string(),
-        }
-    }
-
-    fn format_inline_marks(inline_marks: &[DisplayMark], inline_marks_width: usize) -> String {
-        format!(
-            "{: >width$}",
-            inline_marks
-                .iter()
-                .map(|mark| match mark {
-                    DisplayMark::AnnotationThrough => "|",
-                    DisplayMark::AnnotationStart => "/",
-                })
-                .collect::<Vec<&str>>()
-                .join(""),
-            width = inline_marks_width
-        )
-    }
-
     fn format_annotation_content(
         range: (usize, usize),
         label: &Option<String>,

src/structs/display_list.rs

@@ -19,7 +19,6 @@
 //!       label: Some("this function takes 1 parameter but 0 parameters were supplied".to_string()),
 //!       annotation_type: AnnotationType::Error,
 //!   }),
-//!   main_annotation_pos: Some(0),
 //!   fold: Some(false),
 //!   annotations: vec![
 //!     Annotation {
@@ -131,9 +130,7 @@ fn format_header(snippet: &Snippet, body: &[DisplayLine]) -> Vec<DisplayLine> {
         })
     }
 
-    let main_annotation = snippet
-        .main_annotation_pos
-        .and_then(|pos| snippet.annotations.get(pos));
+    let main_annotation = snippet.annotations.get(0);
 
     if let Some(annotation) = main_annotation {
         let mut col = 1;

src/structs/snippet.rs

@@ -39,7 +39,6 @@
 //!         id: Some("E0308".to_string()),
 //!         annotation_type: AnnotationType::Error,
 //!     }),
-//!     main_annotation_pos: Some(0),
 //!     fold: Some(true),
 //!     annotations: vec![
 //!         Annotation {
@@ -61,9 +60,6 @@
 pub struct Snippet {
     pub slice: Slice,
     pub annotations: Vec<Annotation>,
-    /// Index of an Annotation to be used
-    /// as a main one in the snippet (for the header part).
-    pub main_annotation_pos: Option<usize>,
     pub title: Option<TitleAnnotation>,
     /// If set explicitly to `true`, the snippet will fold
     /// parts of the slice that don't contain any annotations.

tests/snippet/mod.rs

@@ -12,7 +12,6 @@ pub struct SnippetDef {
     pub slice: Slice,
     #[serde(deserialize_with = "deserialize_annotations")]
     pub annotations: Vec<Annotation>,
-    pub main_annotation_pos: Option<usize>,
     #[serde(deserialize_with = "deserialize_title_annotation")]
     pub title: Option<TitleAnnotation>,
     pub fold: Option<bool>,