Merge branch 'update-cargo-and-dependencies'

Author: onur

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cratesfyi"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["Onur Aslan <[email protected]>"]
 readme = "README.md"
 license = "MIT"
@@ -15,7 +15,7 @@ clap = "2"
 crates-index-diff = "3"
 git2 = "0.6"
 time = "0.1"
-reqwest = "0.4"
+reqwest = "0.5"
 semver = "0.6"
 slug = "=0.1.1"
 env_logger = "0.4"
@@ -25,8 +25,8 @@ r2d2_postgres = "0.12"
 url = "1.4"
 libc = "0.2"
 badge = { version = "0", path = "src/web/badge" }
-error-chain = "0.5"
-comrak = { version = "0.1.3", default-features = false }
+error-chain = "0.10"
+comrak = { version = "0.1", default-features = false }
 
 # iron dependencies
 iron = "0.5"
@@ -37,7 +37,7 @@ staticfile = { version = "0.4", features = [ "cache" ] }
 
 [dependencies.cargo]
 git = "https://github.com/rust-lang/cargo.git"
-rev = "bb1472e02d2384052348ff5ff2357be0ded9442d"
+rev = "9fe7f07579d6d2672dd7e95c70adaea65d8e9a2e"
 
 [dependencies.postgres]
 version = "0.14"

Cargo.toml

@@ -16,9 +16,7 @@ use reqwest::header::{Accept, qitem};
 use semver;
 use postgres::Connection;
 use time;
-
-use errors::*;
-
+use error::Result;
 
 
 /// Adds a package into database.

src/db/add_package.rs

@@ -10,7 +10,7 @@ use postgres::Connection;
 use rustc_serialize::json::{Json, ToJson};
 use std::fs::File;
 use std::io::Read;
-use errors::*;
+use error::Result;
 
 
 

src/db/file.rs

@@ -8,7 +8,7 @@ use std::process::{Command, Output};
 use std::path::PathBuf;
 use postgres::Connection;
 use rustc_serialize::json::Json;
-use errors::*;
+use error::Result;
 use regex::Regex;
 
 

src/docbuilder/chroot_builder.rs

@@ -4,7 +4,7 @@ use std::io::BufReader;
 use std::fs;
 use std::path::PathBuf;
 use rustc_serialize::json::Json;
-use errors::*;
+use error::Result;
 
 
 fn crates_from_file<F>(path: &PathBuf, func: &mut F) -> Result<()>

src/docbuilder/crates.rs

@@ -13,7 +13,7 @@ use std::io::BufReader;
 use std::path::PathBuf;
 use std::collections::BTreeSet;
 use DocBuilderOptions;
-use errors::*;
+use error::Result;
 
 
 /// chroot based documentation builder

src/docbuilder/mod.rs

@@ -2,7 +2,7 @@
 
 use std::{env, fmt};
 use std::path::PathBuf;
-use errors::*;
+use error::Result;
 
 
 #[derive(Clone)]

src/docbuilder/options.rs

@@ -3,7 +3,7 @@
 
 use super::DocBuilder;
 use db::connect_db;
-use errors::*;
+use error::Result;
 use crates_index_diff::{ChangeKind, Index};
 
 

src/docbuilder/queue.rs

@@ -0,0 +1,23 @@
+//! Errors used in cratesfyi
+
+use std::io;
+use rustc_serialize::json;
+use postgres;
+use cargo;
+use reqwest;
+use magic::MagicError;
+use git2;
+
+
+error_chain! {
+    foreign_links {
+        IoError(io::Error);
+        JsonBuilderError(json::BuilderError);
+        PostgresConnectError(postgres::error::ConnectError);
+        PostgresError(postgres::error::Error);
+        ReqwestError(reqwest::Error);
+        Git2Error(git2::Error);
+        MagicError(MagicError);
+        CargoError(Box<cargo::CargoError>);
+    }
+}