Auto merge of #360 - pietroalbini:update-deps, r=pietroalbini

Update dependencies

Author: bors

Cargo.lock

@@ -9,62 +9,59 @@ build = "build.rs"
 opt-level = 0
 
 [dependencies]
+base64 = "0.10.0"
+bytes = "0.4.9"
 chrono = { version = "0.4", features = ["serde"] }
+chrono-humanize = "0.0.11"
 crates-index = "0.12"
 crossbeam-utils = "0.5"
+csv = "1.0.2"
 dotenv = "0.13"
 error-chain = "0.12"
+failure = "0.1.3"
 flate2 = "1"
 futures = "0.1.13"
-futures-cpupool = "0.1.5"
+http = "0.1.10"
+hyper = "0.12.8"
 lazy_static = "1.0"
 mime = "0.3.1"
+minifier = { version = "0.0.20", features = ["html"] }
+nix = "0.11.0"
 petgraph = "0.4.11"
+r2d2 = "0.8.2"
+r2d2_sqlite = "0.7.0"
 rand = "0.5"
 ref_slice = "1.1.1"
+regex = "1.0"
 reqwest = "0.9"
-rusoto_core = "0.34.0"
-rusoto_s3 = "0.34.0"
+ring = "0.13"
+rusoto_core = "0.35.0"
+rusoto_credential = "0.14.0"
+rusoto_s3 = "0.35.0"
+rusqlite = { version = "0.15.0", features = ["chrono", "functions", "bundled"] }
 scopeguard = "0.3"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 serde_regex = "0.3.0"
-slog = "~2.3"
+slog = "2.4.1"
 slog-scope = "4"
 slog-term = "2"
 structopt = "0.2"
 structopt-derive = "0.2"
 tar = "0.4.0"
 tempfile = "3.0.0"
-tokio-core = "0.1.7"
-tokio-io = "0.1.1"
-tokio-process = "0.1.2"
-tokio-timer = "0.1.1"
+tera = "0.11.7"
+tokio = "0.1.11"
+tokio-process = "0.2.3"
 toml = "0.4.6"
 url = "1.1"
 walkdir = "2"
+warp = "0.1.9"
 winapi = "0.3"
-regex = "1.0"
-ring = "0.13"
-rusqlite = { version = "0.14.0", features = ["chrono", "functions", "bundled"] }
-r2d2 = "0.8.2"
-r2d2_sqlite = "0.6.0"
-base64 = "0.9.0"
-tera = "0.11.7"
-minifier = { version = "0.0.19", features = ["html"] }
-warp = "0.1.3"
-http = "0.1.10"
-hyper = "0.12.8"
-bytes = "0.4.9"
-chrono-humanize = "0.0.11"
-csv = "1.0.2"
-rusoto_credential = "0.13.0"
-nix = "0.11.0"
-failure = "0.1.3"
 
 [dev-dependencies]
 assert_cmd = "0.10.1"
-predicates = "1.0.0"
 difference = "2.0.0"
 num_cpus = "1.8.0"
+predicates = "1.0.0"

Cargo.toml

@@ -4,6 +4,10 @@ use rusqlite::{Connection, Transaction};
 use serde_json;
 use std::collections::HashSet;
 
+fn no_args() -> impl Iterator<Item = &'static str> {
+    ::std::iter::empty()
+}
+
 enum MigrationKind {
     SQL(&'static str),
     Code(Box<Fn(&Transaction) -> ::rusqlite::Result<()>>),
@@ -156,26 +160,26 @@ fn migrations() -> Vec<(&'static str, MigrationKind)> {
                 }
             })?;
 
-            t.execute("PRAGMA foreign_keys = OFF;", &[])?;
+            t.execute("PRAGMA foreign_keys = OFF;", no_args())?;
             t.execute(
                 &format!(
                     "UPDATE experiments SET toolchain_start = {}(toolchain_start);",
                     fn_name
                 ),
-                &[],
+                no_args(),
             )?;
             t.execute(
                 &format!(
                     "UPDATE experiments SET toolchain_end = {}(toolchain_end);",
                     fn_name
                 ),
-                &[],
+                no_args(),
             )?;
             t.execute(
                 &format!("UPDATE results SET toolchain = {}(toolchain);", fn_name),
-                &[],
+                no_args(),
             )?;
-            t.execute("PRAGMA foreign_keys = ON;", &[])?;
+            t.execute("PRAGMA foreign_keys = ON;", no_args())?;
 
             Ok(())
         })),
@@ -245,16 +249,19 @@ fn migrations() -> Vec<(&'static str, MigrationKind)> {
 
 pub fn execute(db: &mut Connection) -> Fallible<()> {
     // If the database version is 0, create the migrations table and bump it
-    let version: i32 = db.query_row("PRAGMA user_version;", &[], |r| r.get(0))?;
+    let version: i32 = db.query_row("PRAGMA user_version;", no_args(), |r| r.get(0))?;
     if version == 0 {
-        db.execute("CREATE TABLE migrations (name TEXT PRIMARY KEY);", &[])?;
-        db.execute("PRAGMA user_version = 1;", &[])?;
+        db.execute(
+            "CREATE TABLE migrations (name TEXT PRIMARY KEY);",
+            no_args(),
+        )?;
+        db.execute("PRAGMA user_version = 1;", no_args())?;
     }
 
     let executed_migrations = {
         let mut prepared = db.prepare("SELECT name FROM migrations;")?;
         let mut result = HashSet::new();
-        for value in prepared.query_map(&[], |row| -> String { row.get("name") })? {
+        for value in prepared.query_map(no_args(), |row| -> String { row.get("name") })? {
             result.insert(value?);
         }
 

src/db/migrations.rs

@@ -17,7 +17,7 @@ struct ConnectionCustomizer;
 
 impl CustomizeConnection<Connection, ::rusqlite::Error> for ConnectionCustomizer {
     fn on_acquire(&self, conn: &mut Connection) -> Result<(), ::rusqlite::Error> {
-        conn.execute("PRAGMA foreign_keys = ON;", &[])?;
+        conn.execute("PRAGMA foreign_keys = ON;", ::std::iter::empty::<&ToSql>())?;
         Ok(())
     }
 }

src/db/mod.rs

@@ -13,7 +13,6 @@ extern crate csv;
 extern crate failure;
 extern crate flate2;
 extern crate futures;
-extern crate futures_cpupool;
 extern crate http;
 extern crate hyper;
 #[macro_use]
@@ -41,28 +40,16 @@ extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
 extern crate serde_regex;
-#[macro_use(
-    slog_o,
-    slog_info,
-    slog_log,
-    slog_error,
-    slog_warn,
-    slog_record,
-    slog_record_static,
-    slog_b,
-    slog_kv
-)]
+#[macro_use(slog_o, slog_info, slog_error, slog_warn,)]
 extern crate slog;
 #[macro_use]
 extern crate slog_scope;
 extern crate slog_term;
 extern crate tar;
 extern crate tempfile;
 extern crate tera;
-extern crate tokio_core;
-extern crate tokio_io;
+extern crate tokio;
 extern crate tokio_process;
-extern crate tokio_timer;
 #[cfg_attr(test, macro_use)]
 extern crate toml;
 #[macro_use]

src/lib.rs

@@ -1,13 +1,6 @@
 #![deny(unused_extern_crates)]
 extern crate dotenv;
-#[macro_use(
-    slog_info,
-    slog_log,
-    slog_record,
-    slog_record_static,
-    slog_b,
-    slog_kv
-)]
+#[macro_use(slog_info)]
 extern crate slog;
 #[macro_use]
 extern crate slog_scope;