Update to Rust 2018

Author: Zibi Braniecki

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "annotate-snippets"
-version = "0.1.0"
+version = "0.2.0"
+edition = "2018"
 authors = ["Zibi Braniecki <[email protected]>"]
 description = "Library for building code annotations"
 license = "Apache-2.0/MIT"

src/display_list/from_snippet.rs

@@ -1,6 +1,6 @@
 //! Trait for converting `Snippet` to `DisplayList`.
 use super::*;
-use snippet;
+use crate::snippet;
 
 fn format_label(label: Option<&str>, style: Option<DisplayTextStyle>) -> Vec<DisplayTextFragment> {
     let mut result = vec![];

src/formatter/mod.rs

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

src/stylesheets/no_color.rs

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

tests/fixtures.rs

@@ -11,18 +11,18 @@ use annotate_snippets::display_list::DisplayList;
 use annotate_snippets::formatter::DisplayListFormatter;
 use annotate_snippets::snippet::Snippet;
 use glob::glob;
-use snippet::SnippetDef;
+use crate::snippet::SnippetDef;
 use std::error::Error;
 use std::fs::File;
 use std::io;
 use std::io::prelude::*;
 use std::path::Path;
 
 fn read_file(path: &str) -> Result<String, io::Error> {
-    let mut f = try!(File::open(path));
+    let mut f = File::open(path)?;
     let mut s = String::new();
-    try!(f.read_to_string(&mut s));
-    Ok(s.trim_right().to_string())
+    (f.read_to_string(&mut s))?;
+    Ok(s.trim_end().to_string())
 }
 
 fn read_fixture<P: AsRef<Path>>(path: P) -> Result<Snippet, Box<Error>> {
@@ -49,11 +49,11 @@ fn test_fixtures() {
         let dlf = DisplayListFormatter::new(true);
         let actual_out = dlf.format(&dl);
         println!("{}", expected_out);
-        println!("{}", actual_out.trim_right());
+        println!("{}", actual_out.trim_end());
 
         assert_eq!(
             expected_out,
-            actual_out.trim_right(),
+            actual_out.trim_end(),
             "\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())