Reorganize structure

Author: Zibi Braniecki

src/display_list.rs renamed to src/display_list/ds_from_snippet.rs

@@ -1,88 +1,5 @@
 use snippet::{Annotation, AnnotationType, Slice, Snippet};
-
-pub struct DisplayList {
-    pub body: Vec<DisplayLine>,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum DisplayLine {
-    Annotation {
-        label: Vec<DisplayTextFragment>,
-        id: Option<String>,
-        aligned: bool,
-        annotation_type: DisplayAnnotationType,
-    },
-    Origin {
-        path: String,
-        pos: Option<(usize, usize)>,
-        header_type: DisplayHeaderType,
-    },
-    EmptySource,
-    Source {
-        lineno: usize,
-        inline_marks: Vec<DisplayMark>,
-        content: String,
-        range: (usize, usize),
-    },
-    SourceAnnotation {
-        inline_marks: Vec<DisplayMark>,
-        range: (usize, usize),
-        label: Vec<DisplayTextFragment>,
-        annotation_type: DisplayAnnotationType,
-        annotation_part: DisplayAnnotationPart,
-    },
-    Fold {
-        inline_marks: Vec<DisplayMark>,
-    },
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct DisplayTextFragment {
-    pub content: String,
-    pub style: DisplayTextStyle,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum DisplayTextStyle {
-    Regular,
-    Emphasis,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum DisplayAnnotationPart {
-    Singleline,
-    MultilineStart,
-    MultilineEnd,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct DisplayMark {
-    pub mark_type: DisplayMarkType,
-    pub annotation_type: DisplayAnnotationType,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum DisplayMarkType {
-    AnnotationThrough,
-    AnnotationStart,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum DisplayAnnotationType {
-    Error,
-    Warning,
-    Info,
-    Note,
-    Help,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum DisplayHeaderType {
-    Initial,
-    Continuation,
-}
-
-// Formatting
+use super::*;
 
 fn format_label(label: Option<&str>, style: Option<DisplayTextStyle>) -> Vec<DisplayTextFragment> {
     let mut result = vec![];

src/display_list/ds_struct.rs

@@ -0,0 +1,81 @@
+pub struct DisplayList {
+    pub body: Vec<DisplayLine>,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum DisplayLine {
+    Annotation {
+        label: Vec<DisplayTextFragment>,
+        id: Option<String>,
+        aligned: bool,
+        annotation_type: DisplayAnnotationType,
+    },
+    Origin {
+        path: String,
+        pos: Option<(usize, usize)>,
+        header_type: DisplayHeaderType,
+    },
+    EmptySource,
+    Source {
+        lineno: usize,
+        inline_marks: Vec<DisplayMark>,
+        content: String,
+        range: (usize, usize),
+    },
+    SourceAnnotation {
+        inline_marks: Vec<DisplayMark>,
+        range: (usize, usize),
+        label: Vec<DisplayTextFragment>,
+        annotation_type: DisplayAnnotationType,
+        annotation_part: DisplayAnnotationPart,
+    },
+    Fold {
+        inline_marks: Vec<DisplayMark>,
+    },
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct DisplayTextFragment {
+    pub content: String,
+    pub style: DisplayTextStyle,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum DisplayTextStyle {
+    Regular,
+    Emphasis,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum DisplayAnnotationPart {
+    Singleline,
+    MultilineStart,
+    MultilineEnd,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct DisplayMark {
+    pub mark_type: DisplayMarkType,
+    pub annotation_type: DisplayAnnotationType,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum DisplayMarkType {
+    AnnotationThrough,
+    AnnotationStart,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum DisplayAnnotationType {
+    Error,
+    Warning,
+    Info,
+    Note,
+    Help,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum DisplayHeaderType {
+    Initial,
+    Continuation,
+}

src/display_list/mod.rs

@@ -0,0 +1,4 @@
+mod ds_struct;
+mod ds_from_snippet;
+
+pub use self::ds_struct::*;

src/display_list_formatting.rs renamed to src/formatter/mod.rs

@@ -1,30 +1,15 @@
+pub mod style;
+
 use display_list::{DisplayAnnotationPart, DisplayAnnotationType, DisplayHeaderType, DisplayLine,
                    DisplayList, DisplayMark, DisplayMarkType, DisplayTextFragment,
                    DisplayTextStyle};
 use std::fmt;
 
-use format::NoColorStylesheet;
-#[cfg(feature = "ansi_term")]
-use format_color::AnsiTermStylesheet;
-
-pub enum StyleClass {
-    Error,
-    Warning,
-    Info,
-    Note,
-    Help,
-
-    LineNo,
-}
+use self::style::{StyleClass, Stylesheet};
 
-pub trait Style {
-    fn paint(&self, text: String) -> String;
-    fn bold(&self) -> Box<Style>;
-}
-
-pub trait Stylesheet {
-    fn get_style(&self, class: StyleClass) -> Box<Style>;
-}
+use stylesheets::no_color::NoColorStylesheet;
+#[cfg(feature = "ansi_term")]
+use stylesheets::color::AnsiTermStylesheet;
 
 pub struct DisplayListFormatter {
     stylesheet: Box<Stylesheet>,

src/formatter/style.rs

@@ -0,0 +1,18 @@
+pub enum StyleClass {
+    Error,
+    Warning,
+    Info,
+    Note,
+    Help,
+
+    LineNo,
+}
+
+pub trait Style {
+    fn paint(&self, text: String) -> String;
+    fn bold(&self) -> Box<Style>;
+}
+
+pub trait Stylesheet {
+    fn get_style(&self, class: StyleClass) -> Box<Style>;
+}

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`.
 
-pub mod display_list;
-pub mod display_list_formatting;
-pub mod format;
-#[cfg(feature = "ansi_term")]
-pub mod format_color;
 pub mod snippet;
+pub mod display_list;
+pub mod formatter;
+pub mod stylesheets;

src/format_color.rs renamed to src/stylesheets/color.rs

@@ -1,8 +1,9 @@
+use formatter::style::{Style, StyleClass, Stylesheet};
+
 extern crate ansi_term;
 
 use self::ansi_term::Color::Fixed;
 use self::ansi_term::Style as AnsiTermStyle;
-use display_list_formatting::{Style, StyleClass, Stylesheet};
 
 struct AnsiTermStyleWrapper {
     style: AnsiTermStyle,

src/stylesheets/mod.rs

@@ -0,0 +1,3 @@
+pub mod no_color;
+#[cfg(feature = "ansi_term")]
+pub mod color;

src/format.rs renamed to src/stylesheets/no_color.rs

@@ -1,4 +1,4 @@
-use display_list_formatting::{Style, StyleClass, Stylesheet};
+use formatter::style::{Style, StyleClass, Stylesheet};
 
 pub struct NoOpStyle {}