Clean up the code after 2018 update

Author: Zibi Braniecki

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "annotate-snippets"
-version = "0.2.0"
+version = "0.5.0"
 edition = "2018"
 authors = ["Zibi Braniecki <[email protected]>"]
 description = "Library for building code annotations"
@@ -19,12 +19,12 @@ maintenance = { status = "actively-developed" }
 ansi_term = { version = "0.11.0", optional = true }
 
 [dev-dependencies]
-glob = "0.2"
-serde_yaml = "0.7"
-serde = "1.0"
-serde_derive = "1.0"
-difference = "2.0"
-ansi_term = "0.11"
+glob = "^0.2"
+serde_yaml = "^0.8"
+serde = "^1.0"
+serde_derive = "^1.0"
+difference = "^2.0"
+ansi_term = "^0.11"
 
 [features]
 default = []

examples/expected_type.rs

@@ -16,7 +16,8 @@ fn main() {
             source: r#"                annotations: vec![SourceAnnotation {
                 label: "expected struct `annotate_snippets::snippet::Slice`, found reference"
                     .to_string(),
-                range: <22, 25>,"#.to_string(),
+                range: <22, 25>,"#
+                .to_string(),
             line_start: 26,
             origin: Some("examples/footer.rs".to_string()),
             fold: true,

examples/format.rs

@@ -28,7 +28,8 @@ fn main() {
             }
             _ => continue,
         }
-    }"#.to_string(),
+    }"#
+            .to_string(),
             line_start: 51,
             origin: Some("src/format.rs".to_string()),
             fold: false,

src/display_list/from_snippet.rs

@@ -9,11 +9,13 @@ fn format_label(label: Option<&str>, style: Option<DisplayTextStyle>) -> Vec<Dis
         for (idx, element) in elements.iter().enumerate() {
             let element_style = match style {
                 Some(s) => s,
-                None => if idx % 2 == 0 {
-                    DisplayTextStyle::Regular
-                } else {
-                    DisplayTextStyle::Emphasis
-                },
+                None => {
+                    if idx % 2 == 0 {
+                        DisplayTextStyle::Regular
+                    } else {
+                        DisplayTextStyle::Emphasis
+                    }
+                }
             };
             result.push(DisplayTextFragment {
                 content: element.to_string(),

src/formatter/mod.rs

@@ -10,9 +10,9 @@ use self::style::{Style, StyleClass, Stylesheet};
 use crate::display_list::*;
 use std::cmp;
 
-#[cfg(feature = "ansi_term")]
-use stylesheets::color::AnsiTermStylesheet;
 use crate::stylesheets::no_color::NoColorStylesheet;
+#[cfg(feature = "ansi_term")]
+use crate::stylesheets::color::AnsiTermStylesheet;
 
 fn repeat_char(c: char, n: usize) -> String {
     let mut s = String::with_capacity(c.len_utf8());

src/stylesheets/color.rs

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

tests/fixtures.rs

@@ -7,11 +7,11 @@ extern crate glob;
 extern crate serde_derive;
 extern crate serde_yaml;
 
+use crate::snippet::SnippetDef;
 use annotate_snippets::display_list::DisplayList;
 use annotate_snippets::formatter::DisplayListFormatter;
 use annotate_snippets::snippet::Snippet;
 use glob::glob;
-use crate::snippet::SnippetDef;
 use std::error::Error;
 use std::fs::File;
 use std::io;