use failure instead of error-chain

needed because cargo's CargoError is a re-export of failure's Error, and
doesn't work with error-chain

Author: QuietMisdreavus

Cargo.lock

@@ -25,7 +25,7 @@ r2d2_postgres = "0.12"
 url = "1.4"
 libc = "0.2"
 badge = { version = "0", path = "src/web/badge" }
-error-chain = "0.12"
+failure = "0.1"
 comrak = { version = "0.2.10", default-features = false }
 toml = "0.4"
 html5ever = "0.22"
@@ -50,6 +50,9 @@ time = "0.1"
 git2 = "0.7"
 sass-rs = "0.2"
 
+[patch.crates-io]
+failure = { git = "https://github.com/rust-lang-nursery/failure.git" }
+
 [[bin]]
 name = "cratesfyi"
 test = false

Cargo.toml

@@ -18,7 +18,7 @@ use semver;
 use postgres::Connection;
 use time;
 use error::Result;
-
+use failure::err_msg;
 
 /// Adds a package into database.
 ///
@@ -222,7 +222,7 @@ fn convert_dependencies(pkg: &Package) -> Vec<(String, String)> {
 
 /// Reads readme if there is any read defined in Cargo.toml of a Package
 fn get_readme(pkg: &Package) -> Result<Option<String>> {
-    let readme_path = PathBuf::from(try!(source_path(&pkg).ok_or("File not found")))
+    let readme_path = PathBuf::from(try!(source_path(&pkg).ok_or_else(|| err_msg("File not found"))))
         .join(pkg.manifest().metadata().readme.clone().unwrap_or("README.md".to_owned()));
 
     if !readme_path.exists() {
@@ -240,7 +240,7 @@ fn get_rustdoc(pkg: &Package) -> Result<Option<String>> {
     if pkg.manifest().targets()[0].src_path().is_absolute() {
         read_rust_doc(pkg.manifest().targets()[0].src_path())
     } else {
-        let mut path = PathBuf::from(try!(source_path(&pkg).ok_or("File not found")));
+        let mut path = PathBuf::from(try!(source_path(&pkg).ok_or_else(|| err_msg("File not found"))));
         path.push(pkg.manifest().targets()[0].src_path());
         read_rust_doc(path.as_path())
     }
@@ -289,31 +289,31 @@ fn get_release_time_yanked_downloads
     let versions = try!(json.as_object()
         .and_then(|o| o.get("versions"))
         .and_then(|v| v.as_array())
-        .ok_or("Not a JSON object"));
+        .ok_or_else(|| err_msg("Not a JSON object")));
 
     let (mut release_time, mut yanked, mut downloads) = (None, None, None);
 
     for version in versions {
-        let version = try!(version.as_object().ok_or("Not a JSON object"));
+        let version = try!(version.as_object().ok_or_else(|| err_msg("Not a JSON object")));
         let version_num = try!(version.get("num")
             .and_then(|v| v.as_string())
-            .ok_or("Not a JSON object"));
+            .ok_or_else(|| err_msg("Not a JSON object")));
 
         if &semver::Version::parse(version_num).unwrap() == pkg.manifest().version() {
             let release_time_raw = try!(version.get("created_at")
                 .and_then(|c| c.as_string())
-                .ok_or("Not a JSON object"));
+                .ok_or_else(|| err_msg("Not a JSON object")));
             release_time = Some(time::strptime(release_time_raw, "%Y-%m-%dT%H:%M:%S")
                 .unwrap()
                 .to_timespec());
 
             yanked = Some(try!(version.get("yanked")
                 .and_then(|c| c.as_boolean())
-                .ok_or("Not a JSON object")));
+                .ok_or_else(|| err_msg("Not a JSON object"))));
 
             downloads = Some(try!(version.get("downloads")
                 .and_then(|c| c.as_i64())
-                .ok_or("Not a JSON object")) as i32);
+                .ok_or_else(|| err_msg("Not a JSON object"))) as i32);
 
             break;
         }

src/db/add_package.rs

@@ -11,7 +11,7 @@ use rustc_serialize::json::{Json, ToJson};
 use std::fs::File;
 use std::io::Read;
 use error::Result;
-
+use failure::err_msg;
 
 
 fn file_path(prefix: &str, name: &str) -> String {
@@ -49,7 +49,7 @@ pub fn get_file_list<P: AsRef<Path>>(path: P) -> Result<Vec<String>> {
     let mut files: Vec<String> = Vec::new();
 
     if !path.exists() {
-        return Err("File not found".into());
+        return Err(err_msg("File not found"));
     } else if path.is_file() {
         path.file_name()
             .and_then(|name| name.to_str())

src/db/file.rs

@@ -5,12 +5,13 @@ use utils::{get_package, source_path, copy_dir, copy_doc_dir,
             update_sources, parse_rustc_version, command_result};
 use db::{connect_db, add_package_into_database, add_build_into_database, add_path_into_database};
 use cargo::core::Package;
+use cargo::util::CargoResultExt;
 use std::process::Command;
 use std::path::PathBuf;
 use std::fs::remove_dir_all;
 use postgres::Connection;
 use rustc_serialize::json::Json;
-use error::{Result, ResultExt};
+use error::Result;
 
 
 /// List of targets supported by docs.rs
@@ -115,7 +116,6 @@ impl DocBuilder {
 
     /// Builds documentation of a package with cratesfyi in chroot environment
     fn build_package_in_chroot(&self, package: &Package) -> ChrootBuilderResult {
-        use std::error::Error as StdError;
         debug!("Building package in chroot");
         let (rustc_version, cratesfyi_version) = self.get_versions();
         let cmd = format!("cratesfyi doc {} ={}",
@@ -134,7 +134,7 @@ impl DocBuilder {
             }
             Err(e) => {
                 ChrootBuilderResult {
-                    output: e.description().to_owned(),
+                    output: e.to_string(),
                     build_success: false,
                     have_doc: false,
                     have_examples: self.have_examples(&package),
@@ -356,7 +356,7 @@ impl DocBuilder {
         let rustc_version = parse_rustc_version(&res.rustc_version)?;
 
         if !res.build_success {
-            return Err(format!("Failed to build empty crate for: {}", res.rustc_version).into());
+            return Err(format_err!("Failed to build empty crate for: {}", res.rustc_version));
         }
 
         info!("Copying essential files for: {}", res.rustc_version);

src/docbuilder/chroot_builder.rs

@@ -5,7 +5,7 @@ use std::fs;
 use std::path::PathBuf;
 use rustc_serialize::json::Json;
 use error::Result;
-
+use failure::err_msg;
 
 fn crates_from_file<F>(path: &PathBuf, func: &mut F) -> Result<()>
     where F: FnMut(&str, &str) -> ()
@@ -28,13 +28,13 @@ fn crates_from_file<F>(path: &PathBuf, func: &mut F) -> Result<()>
             Err(_) => continue,
         };
 
-        let obj = try!(data.as_object().ok_or("Not a JSON object"));
+        let obj = try!(data.as_object().ok_or_else(|| err_msg("Not a JSON object")));
         let crate_name = try!(obj.get("name")
             .and_then(|n| n.as_string())
-            .ok_or("`name` not found in JSON object"));
+            .ok_or_else(|| err_msg("`name` not found in JSON object")));
         let vers = try!(obj.get("vers")
             .and_then(|n| n.as_string())
-            .ok_or("`vers` not found in JSON object"));
+            .ok_or_else(|| err_msg("`vers` not found in JSON object")));
 
         // Skip yanked crates
         if obj.get("yanked").and_then(|n| n.as_boolean()).unwrap_or(false) {
@@ -63,7 +63,7 @@ pub fn crates_from_path<F>(path: &PathBuf, func: &mut F) -> Result<()>
 {
 
     if !path.is_dir() {
-        return Err("Not a directory".into());
+        return Err(err_msg("Not a directory"));
     }
 
     for file in try!(path.read_dir()) {

src/docbuilder/crates.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 use cargo::core::Package;
 use toml::Value;
 use error::Result;
-
+use failure::err_msg;
 
 /// Metadata for custom builds
 ///
@@ -61,14 +61,14 @@ pub struct Metadata {
 
 impl Metadata {
     pub fn from_package(pkg: &Package) -> Result<Metadata> {
-        let src_path = pkg.manifest_path().parent().ok_or("Source path not available")?;
+        let src_path = pkg.manifest_path().parent().ok_or_else(|| err_msg("Source path not available"))?;
         for c in ["Cargo.toml.orig", "Cargo.toml"].iter() {
             let manifest_path = src_path.clone().join(c);
             if manifest_path.exists() {
                 return Ok(Metadata::from_manifest(manifest_path));
             }
         }
-        Err("Manifest not found".into())
+        Err(err_msg("Manifest not found"))
     }
 
     pub fn from_manifest<P: AsRef<Path>>(path: P) -> Metadata {

src/docbuilder/metadata.rs

@@ -3,7 +3,7 @@
 use std::{env, fmt};
 use std::path::PathBuf;
 use error::Result;
-
+use failure::err_msg;
 
 #[derive(Clone)]
 pub struct DocBuilderOptions {
@@ -94,16 +94,16 @@ impl DocBuilderOptions {
 
     pub fn check_paths(&self) -> Result<()> {
         if !self.destination.exists() {
-            return Err("Destination path not exists".into());
+            return Err(err_msg("Destination path not exists"));
         }
         if !self.chroot_path.exists() {
-            return Err("Chroot path not exists".into());
+            return Err(err_msg("Chroot path not exists"));
         }
         if !self.crates_io_index_path.exists() {
-            return Err("crates.io-index path not exists".into());
+            return Err(err_msg("crates.io-index path not exists"));
         }
         if !self.crates_io_index_path.exists() {
-            return Err("Logs path not exists".into());
+            return Err(err_msg("Logs path not exists"));
         }
         Ok(())
     }

src/docbuilder/options.rs

@@ -1,25 +1,7 @@
 //! Errors used in cratesfyi
 
-use std::io;
-use rustc_serialize::json;
-use postgres;
-use cargo;
-use reqwest;
-use magic::MagicError;
-use git2;
-use regex;
+use std::result::Result as StdResult;
 
+pub use failure::{Error, ResultExt};
 
-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(cargo::CargoError);
-        RegexError(regex::Error);
-    }
-}
+pub type Result<T> = StdResult<T, Error>;