Merge pull request #249 from alanhdu/deps

Upgrade non-iron dependencies

Author: QuietMisdreavus

Cargo.lock

@@ -8,25 +8,25 @@ repository = "https://github.com/rust-lang-nursery/docs.rs"
 build = "build.rs"
 
 [dependencies]
-log = "0.3"
+log = "0.4"
 rustc-serialize = "0.3"
-regex = "0.2"
+regex = "1"
 clap = "2"
 crates-index-diff = "4"
 git2 = "0.7"
 time = "0.1"
 reqwest = "0.9"
 semver = "0.9"
 slug = "=0.1.1"
-env_logger = "0.4"
+env_logger = "0.5"
 magic = "0.12"
-r2d2 = "0.7"
-r2d2_postgres = "0.12"
+r2d2 = "0.8"
+r2d2_postgres = "0.14"
 url = "1.4"
 libc = "0.2"
 badge = { version = "0", path = "src/web/badge" }
-failure = "0.1"
-comrak = { version = "0.2.10", default-features = false }
+failure = "0.1.3"
+comrak = { version = "0.3", default-features = false }
 toml = "0.4"
 html5ever = "0.22"
 cargo = { git = "https://github.com/rust-lang/cargo.git" }
@@ -39,7 +39,7 @@ params = "0.6"
 staticfile = { version = "0.4", features = [ "cache" ] }
 
 [dependencies.postgres]
-version = "0.14"
+version = "0.15"
 features = [ "with-time", "with-rustc-serialize" ]
 
 [dev-dependencies]
@@ -50,9 +50,6 @@ 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

@@ -233,16 +233,18 @@ pub fn main() {
 
 
 fn logger_init() {
-    let format = |record: &log::LogRecord| {
-        format!("{} [{}] {}: {}",
+    use std::io::Write;
+
+    let format = |buf: &mut env_logger::Formatter, record: &log::Record| {
+        writeln!(buf, "{} [{}] {}: {}",
                 time::now().strftime("%Y/%m/%d %H:%M:%S").unwrap(),
                 record.level(),
                 record.target(),
                 record.args())
     };
 
-    let mut builder = env_logger::LogBuilder::new();
+    let mut builder = env_logger::Builder::new();
     builder.format(format);
     builder.parse(&env::var("RUST_LOG").unwrap_or("cratesfyi=info".to_owned()));
-    builder.init().unwrap();
+    builder.init();
 }

src/bin/cratesfyi.rs

@@ -5,7 +5,7 @@ pub use self::add_package::add_build_into_database;
 pub use self::file::add_path_into_database;
 
 use postgres::{Connection, TlsMode};
-use postgres::error::{Error, ConnectError};
+use postgres::error::Error;
 use std::env;
 use r2d2;
 use r2d2_postgres;
@@ -15,7 +15,7 @@ mod file;
 
 
 /// Connects to database
-pub fn connect_db() -> Result<Connection, ConnectError> {
+pub fn connect_db() -> Result<Connection, Error> {
     // FIXME: unwrap might not be the best here
     let db_url = env::var("CRATESFYI_DATABASE_URL")
         .expect("CRATESFYI_DATABASE_URL environment variable is not exists");
@@ -26,11 +26,10 @@ pub fn connect_db() -> Result<Connection, ConnectError> {
 pub fn create_pool() -> r2d2::Pool<r2d2_postgres::PostgresConnectionManager> {
     let db_url = env::var("CRATESFYI_DATABASE_URL")
         .expect("CRATESFYI_DATABASE_URL environment variable is not exists");
-    let config = r2d2::Config::default();
     let manager = r2d2_postgres::PostgresConnectionManager::new(&db_url[..],
                                                                 r2d2_postgres::TlsMode::None)
         .expect("Failed to create PostgresConnectionManager");
-    r2d2::Pool::new(config, manager).expect("Failed to create r2d2 pool")
+    r2d2::Pool::builder().build(manager).expect("Failed to create r2d2 pool")
 }
 
 

src/db/mod.rs

@@ -141,7 +141,7 @@ mod test {
 
     #[test]
     fn test_cratesfyi_metadata() {
-        let _ = env_logger::init();
+        let _ = env_logger::try_init();
         let manifest = r#"
             [package]
             name = "test"

src/docbuilder/metadata.rs

@@ -12,4 +12,4 @@ path = "badge.rs"
 
 [dependencies]
 base64 = "0.9.0"
-rusttype = "0.4.0"
+rusttype = "0.7"

src/web/badge/Cargo.toml

@@ -44,9 +44,9 @@ pub struct Badge {
 
 impl Badge {
     pub fn new(options: BadgeOptions) -> Result<Badge, String> {
-        let collection = FontCollection::from_bytes(FONT_DATA);
+        let collection = FontCollection::from_bytes(FONT_DATA).expect("Failed to parse FONT_DATA");
         // this should never fail in practice
-        let font = try!(collection.into_font().ok_or("Failed to load font data".to_owned()));
+        let font = try!(collection.into_font().map_err(|_| "Failed to load font data".to_owned()));
         let scale = Scale {
             x: FONT_SIZE,
             y: FONT_SIZE,