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

Update dependencies

This PR starts updating the dependencies of Crater, to make it compatible with Rust 1.48.0. A future PR should update the hyper/reqwest/warp dependency block to trim down the number of duplicate dependencies.

Author: bors

Cargo.lock

@@ -13,11 +13,11 @@ build = "build.rs"
 opt-level = 0
 
 [dependencies]
-base64 = "0.10.1"
+base64 = "0.13.0"
 bytes = "0.4.9"
 chrono = { version = "0.4", features = ["serde"] }
-chrono-humanize = "0.0.11"
-crates-index = "0.12"
+chrono-humanize = "0.1.1"
+crates-index = "0.16.2"
 crossbeam-utils = "0.5"
 csv = "1.0.2"
 dotenv = "0.13"
@@ -68,11 +68,11 @@ percent-encoding = "2.1.0"
 remove_dir_all = "0.5.2"
 ctrlc = "3.1.3"
 prometheus = "0.7.0"
-cargo_metadata = "0.9.1"
+cargo_metadata = "0.12.1"
 indexmap = "1.4.0"
 
 [dev-dependencies]
-assert_cmd = "0.10.1"
+assert_cmd = "1.0.2"
 difference = "2.0.0"
 num_cpus = "1.8.0"
 predicates = "1.0.0"

Cargo.toml

@@ -10,6 +10,7 @@ use http::{header::AUTHORIZATION, Method, StatusCode};
 use reqwest::RequestBuilder;
 use serde::de::DeserializeOwned;
 use serde_json::json;
+use std::error::Error as _;
 
 #[derive(Debug, Fail)]
 pub enum AgentApiError {
@@ -100,7 +101,7 @@ impl AgentApi {
                         let hyper_io = err
                             .get_ref()
                             .and_then(|inner| inner.downcast_ref::<::hyper::Error>())
-                            .and_then(|inner| inner.cause2())
+                            .and_then(|inner| inner.source())
                             .map(|inner| inner.is::<::std::io::Error>())
                             .unwrap_or(false);
                         reqwest_io || hyper_io

src/agent/api.rs

@@ -26,7 +26,7 @@ fn main() {
     env.filter_module("crater", log::LevelFilter::Info);
     env.filter_module("rustwide", log::LevelFilter::Info);
     if let Ok(content) = std::env::var("RUST_LOG") {
-        env.parse(&content);
+        env.parse_filters(&content);
     }
     rustwide::logging::init_with(env.build());
 

src/main.rs

@@ -3,12 +3,12 @@ use crate::report::Comparison;
 use crate::results::{BrokenReason, FailureReason, TestResult};
 
 pub trait ResultName {
-    fn name(&self) -> String;
+    fn short_name(&self) -> String;
     fn long_name(&self) -> String;
 }
 
 impl ResultName for FailureReason {
-    fn name(&self) -> String {
+    fn short_name(&self) -> String {
         match self {
             FailureReason::Unknown => "failed (unknown)".into(),
             FailureReason::Timeout => "timed out".into(),
@@ -25,13 +25,13 @@ impl ResultName for FailureReason {
             FailureReason::Unknown
             | FailureReason::Timeout
             | FailureReason::OOM
-            | FailureReason::ICE => self.name(),
+            | FailureReason::ICE => self.short_name(),
         }
     }
 }
 
 impl ResultName for BrokenReason {
-    fn name(&self) -> String {
+    fn short_name(&self) -> String {
         match self {
             BrokenReason::Unknown => "broken crate".into(),
             BrokenReason::CargoToml => "broken Cargo.toml".into(),
@@ -41,16 +41,16 @@ impl ResultName for BrokenReason {
     }
 
     fn long_name(&self) -> String {
-        self.name()
+        self.short_name()
     }
 }
 
 impl ResultName for TestResult {
-    fn name(&self) -> String {
+    fn short_name(&self) -> String {
         match self {
-            TestResult::BrokenCrate(reason) => reason.name(),
-            TestResult::BuildFail(reason) => format!("build {}", reason.name()),
-            TestResult::TestFail(reason) => format!("test {}", reason.name()),
+            TestResult::BrokenCrate(reason) => reason.short_name(),
+            TestResult::BuildFail(reason) => format!("build {}", reason.short_name()),
+            TestResult::TestFail(reason) => format!("test {}", reason.short_name()),
             TestResult::TestSkipped => "test skipped".into(),
             TestResult::TestPass => "test passed".into(),
             TestResult::Error => "error".into(),
@@ -66,7 +66,7 @@ impl ResultName for TestResult {
             TestResult::TestSkipped
             | TestResult::TestPass
             | TestResult::Error
-            | TestResult::Skipped => self.name(),
+            | TestResult::Skipped => self.short_name(),
         }
     }
 }

src/report/display.rs

@@ -119,7 +119,7 @@ fn write_report<W: ReportWriter>(
                     .entry(run.res.clone())
                     .or_insert_with(|| {
                         result_colors.push(run.res.color());
-                        result_names.push(run.res.name());
+                        result_names.push(run.res.short_name());
                         result_names.len() - 1
                     });
                 runs[pos] = Some(BuildTestResultHTML {

src/report/html.rs

@@ -40,7 +40,7 @@ fn write_crate(
         if !is_child {
             run.res.long_name()
         } else {
-            run.res.name()
+            run.res.short_name()
         }
     };
 

src/report/markdown.rs

@@ -141,7 +141,7 @@ pub fn endpoint_experiment(name: String, data: Arc<Data>) -> Fallible<Response<B
         // all CompilerError and DependsOn failures are grouped together
         let mut result_counts = HashMap::new();
         for (res, count) in ex.get_result_counts(&data.db)? {
-            *result_counts.entry(res.name()).or_default() += count;
+            *result_counts.entry(res.short_name()).or_default() += count;
         }
         let mut result_counts = result_counts.into_iter().collect::<Vec<_>>();
         result_counts.sort_by(|v1, v2| (v1.0).cmp(&v2.0));

src/server/routes/ui/experiments.rs

@@ -12,7 +12,7 @@ impl DiskUsage {
         let fs = current_mount()?;
         Ok(Self {
             mount_point: fs.fs_mounted_on.clone(),
-            usage: (fs.total.as_usize() - fs.free.as_usize()) as f32 / fs.total.as_usize() as f32,
+            usage: (fs.total.as_u64() - fs.free.as_u64()) as f32 / fs.total.as_u64() as f32,
         })
     }