Bump dependencies

Author: Mark-Simulacrum

Cargo.lock

@@ -16,12 +16,12 @@ opt-level = 0
 base64 = "0.13.0"
 bytes = "0.4.9"
 chrono = { version = "0.4", features = ["serde"] }
-crates-index = "0.16.2"
+crates-index = "0.18"
 crossbeam-utils = "0.8"
 crossbeam-channel = "0.5"
 csv = "1.0.2"
 docsrs-metadata = { git = "https://github.com/rust-lang/docs.rs/" }
-dotenv = "0.13"
+dotenv = "0.15"
 failure = "0.1.3"
 flate2 = "1"
 http = "0.1.10"
@@ -30,9 +30,9 @@ lazy_static = "1.0"
 mime = "0.3.1"
 minifier = { version = "0.0.20", features = ["html"] }
 r2d2 = "0.8.2"
-r2d2_sqlite = "0.20.0"
-rusqlite = { version = "0.27.0", features = ["chrono", "functions", "bundled"] }
-rand = "0.5"
+r2d2_sqlite = "0.21.0"
+rusqlite = { version = "0.28.0", features = ["chrono", "functions", "bundled"] }
+rand = "0.8"
 regex = "1.0"
 reqwest = { version = "0.11", features = ["blocking", "json"] }
 serde = "1.0"
@@ -45,29 +45,29 @@ tar = "0.4.36"
 tempfile = "3.0.0"
 tera = "0.11.7"
 toml = "0.4.6"
-url = "1.1"
+url = "2"
 walkdir = "2"
 warp = "0.1.9"
 log = "0.4.6"
-env_logger = "0.6.0"
-hmac = "0.7"
-sha-1 = "0.8"
+env_logger = "0.9.0"
+hmac = "0.12"
+sha-1 = "0.10"
 rust_team_data = { git = "https://github.com/rust-lang/team" }
 systemstat = "0.1.11"
 rustwide = { version = "0.14.0", features = ["unstable", "unstable-toolchain-ci"] }
 percent-encoding = "2.1.0"
-remove_dir_all = "0.5.2"
+remove_dir_all = "0.7"
 ctrlc = "3.1.3"
 prometheus = "0.7.0"
 cargo_metadata = "0.12.1"
 indexmap = "1.4.0"
 tokio = "1.18"
-aws-types = { version = "0.12", features = ["hardcoded-credentials"] }
-aws-smithy-http = "0.42"
-aws-sdk-s3 = "0.12"
+aws-types = { version = "0.46", features = ["hardcoded-credentials"] }
+aws-smithy-http = "0.46"
+aws-sdk-s3 = "0.16"
 
 [dev-dependencies]
-assert_cmd = "1.0.2"
+assert_cmd = "2.0.4"
 difference = "2.0.0"
 num_cpus = "1.8.0"
 predicates = "1.0.0"

Cargo.toml

@@ -5,7 +5,7 @@ use crate::db::{Database, QueryUtils};
 use crate::experiments::CrateSelect;
 use crate::prelude::*;
 use chrono::Utc;
-use rand::{thread_rng, Rng};
+use rand::{seq::SliceRandom, thread_rng};
 use std::collections::HashSet;
 
 pub(crate) use crate::crates::sources::{
@@ -141,7 +141,7 @@ pub(crate) fn get_crates(
             crates.append(&mut GitHubList::get(db)?);
 
             let mut rng = thread_rng();
-            rng.shuffle(&mut crates);
+            crates.shuffle(&mut rng);
             crates.truncate(*n as usize);
         }
         CrateSelect::Top(n) => {

src/crates/lists.rs

@@ -15,8 +15,12 @@ impl List for RegistryList {
         let mut counts = HashMap::new();
 
         fs::create_dir_all(&*WORK_DIR)?;
-        let index = Index::new(WORK_DIR.join("crates.io-index"));
-        index.retrieve_or_update().to_failure()?;
+        let mut index = Index::with_path(
+            WORK_DIR.join("crates.io-index"),
+            "https://github.com/rust-lang/crates.io-index",
+        )
+        .to_failure()?;
+        index.update().to_failure()?;
 
         for krate in index.crates() {
             // The versions() method returns the list of published versions starting from the

src/crates/sources/registry.rs

@@ -1,5 +1,8 @@
 use crate::prelude::*;
-use rand::{self, distributions::Alphanumeric, Rng};
+use rand::{
+    self,
+    distributions::{Alphanumeric, DistString},
+};
 use rusqlite::{Connection, Transaction};
 use std::collections::HashSet;
 
@@ -137,10 +140,7 @@ fn migrations() -> Vec<(&'static str, MigrationKind)> {
 
             let fn_name = format!(
                 "crater_migration__{}",
-                rand::thread_rng()
-                    .sample_iter(&Alphanumeric)
-                    .take(10)
-                    .collect::<String>()
+                Alphanumeric.sample_string(&mut rand::thread_rng(), 10)
             );
             t.create_scalar_function(
                 &fn_name,
@@ -332,10 +332,7 @@ fn migrations() -> Vec<(&'static str, MigrationKind)> {
 
             let fn_name = format!(
                 "crater_migration__{}",
-                rand::thread_rng()
-                    .sample_iter(&Alphanumeric)
-                    .take(10)
-                    .collect::<String>()
+                Alphanumeric.sample_string(&mut rand::thread_rng(), 10)
             );
             t.create_scalar_function(
                 &fn_name,

src/db/migrations.rs

@@ -217,7 +217,11 @@ pub fn generate_report<DB: ReadResults>(
     crates: &[Crate],
 ) -> Fallible<RawTestResults> {
     let mut crates = crates.to_vec();
-    let index = Index::new(WORK_DIR.join("crates.io-index"));
+    let index = Index::with_path(
+        WORK_DIR.join("crates.io-index"),
+        "https://github.com/rust-lang/crates.io-index",
+    )
+    .to_failure()?;
     //crate ids are unique so unstable sort is equivalent to stable sort but is generally faster
     crates.sort_unstable_by_key(|a| a.id());
     let res = crates
@@ -694,8 +698,12 @@ mod tests {
         };
         let gh = Crate::GitHub(repo);
 
-        let index = Index::new(WORK_DIR.join("crates.io-index"));
-        index.retrieve_or_update().unwrap();
+        let mut index = Index::with_path(
+            WORK_DIR.join("crates.io-index"),
+            "https://github.com/rust-lang/crates.io-index",
+        )
+        .unwrap();
+        index.update().unwrap();
 
         assert_eq!(
             get_crate_version_status(&index, &reg).unwrap().unwrap(),

src/report/mod.rs

@@ -46,7 +46,11 @@ impl FromStr for S3Prefix {
 
         Ok(S3Prefix {
             bucket,
-            prefix: parsed.path()[1..].into(),
+            prefix: parsed
+                .path()
+                .get(1..)
+                .map(PathBuf::from)
+                .unwrap_or_default(),
         })
     }
 }

src/report/s3.rs

@@ -185,9 +185,9 @@ fn verify_signature(secret: &str, payload: &[u8], raw_signature: &str) -> bool {
     }
 
     // Verify the HMAC signature
-    let mut mac = HmacSha1::new_varkey(secret.as_bytes()).unwrap();
-    mac.input(payload);
-    mac.verify(&signature).is_ok()
+    let mut mac = HmacSha1::new_from_slice(secret.as_bytes()).unwrap();
+    mac.update(payload);
+    mac.verify_slice(&signature).is_ok()
 }
 
 fn receive_endpoint(

src/server/routes/webhooks/mod.rs

@@ -1,7 +1,7 @@
 use crate::common::CommandCraterExt;
 use assert_cmd::prelude::*;
 use difference::Changeset;
-use rand::{self, distributions::Alphanumeric, Rng};
+use rand::distributions::{Alphanumeric, DistString};
 use serde_json::{self, Value};
 use std::env;
 use std::path::{Path, PathBuf};
@@ -148,10 +148,7 @@ impl MinicraterRun {
         let ex_arg = format!(
             "--ex=minicrater-{}-{}",
             self.ex,
-            rand::thread_rng()
-                .sample_iter(&Alphanumeric)
-                .take(10)
-                .collect::<String>()
+            Alphanumeric.sample_string(&mut rand::thread_rng(), 10)
         );
 
         // Create local list in the temp work dir