Update crate for Rust 2018 (#280)

Cargo.lock

@@ -1,3 +1,5 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
 [[package]]
 name = "adler32"
 version = "1.0.3"

Cargo.toml

@@ -18,6 +18,7 @@ exclude = [
     "appveyor.yml",
     ".gitignore",
 ]
+edition = "2018"
 
 [badges]
 appveyor = { repository = "marco-c/grcov" }

src/filter.rs

@@ -1,4 +1,4 @@
-use defs::*;
+use crate::defs::*;
 
 pub fn is_covered(result: &CovResult) -> bool {
     // For C/C++ source files, we can consider a file as being uncovered

src/lib.rs

@@ -11,28 +11,28 @@ extern crate xml;
 extern crate zip;
 
 mod defs;
-pub use defs::*;
+pub use crate::defs::*;
 
 mod producer;
-pub use producer::*;
+pub use crate::producer::*;
 
 mod gcov;
-pub use gcov::*;
+pub use crate::gcov::*;
 
 mod parser;
-pub use parser::*;
+pub use crate::parser::*;
 
 mod filter;
-pub use filter::*;
+pub use crate::filter::*;
 
 mod path_rewriting;
-pub use path_rewriting::*;
+pub use crate::path_rewriting::*;
 
 mod output;
-pub use output::*;
+pub use crate::output::*;
 
 mod reader;
-pub use reader::*;
+pub use crate::reader::*;
 
 use std::collections::{btree_map, hash_map};
 use std::fs;

src/output.rs

@@ -6,7 +6,7 @@ use std::path::PathBuf;
 use uuid::Uuid;
 extern crate md5;
 
-use defs::*;
+use crate::defs::*;
 
 fn get_target_output_writable(output_file: Option<&String>) -> Box<Write> {
     let write_target: Box<Write> = match output_file {

src/parser.rs

@@ -9,7 +9,7 @@ use std::str;
 use xml::attribute::OwnedAttribute;
 use xml::reader::{EventReader, XmlEvent};
 
-use defs::*;
+use crate::defs::*;
 
 #[derive(Debug)]
 pub enum ParserError {
@@ -119,7 +119,7 @@ pub fn parse_lcov<T: Read>(
     loop {
         l.clear();
 
-        let num_bytes = try!(lcov_reader.read_until(b'\n', &mut l));
+        let num_bytes = lcov_reader.read_until(b'\n', &mut l)?;
         if num_bytes == 0 {
             break;
         }
@@ -231,7 +231,7 @@ pub fn parse_gcov(gcov_path: &Path) -> Result<Vec<(String, CovResult)>, ParserEr
     loop {
         l.clear();
 
-        let num_bytes = try!(file.read_until(b'\n', &mut l));
+        let num_bytes = file.read_until(b'\n', &mut l)?;
         if num_bytes == 0 {
             break;
         }

src/path_rewriting.rs

@@ -7,8 +7,8 @@ use std::mem;
 use std::path::{Path, PathBuf};
 use walkdir::{DirEntry, WalkDir};
 
-use defs::*;
-use filter::*;
+use crate::defs::*;
+use crate::filter::*;
 
 fn to_lowercase_first(s: &str) -> String {
     let mut c = s.chars();

src/producer.rs

@@ -10,7 +10,7 @@ use std::path::{Path, PathBuf};
 use walkdir::WalkDir;
 use zip::ZipArchive;
 
-use defs::*;
+use crate::defs::*;
 
 #[derive(Debug)]
 pub enum ArchiveType {

src/reader.rs

@@ -8,7 +8,7 @@ use std::io::{BufReader, Error, Read, Write};
 use std::path::PathBuf;
 use std::result::Result;
 
-use defs::{CovResult, Function};
+use crate::defs::{CovResult, Function};
 
 #[derive(Default)]
 pub struct GCNO {