Auto merge of #677 - Mark-Simulacrum:bump-deps, r=Mark-Simulacrum

Bump dependencies

This takes care of most of the outdated dependencies, modulo hyper/warp.

Author: bors

Cargo.lock

@@ -9,7 +9,7 @@ build = "build.rs"
 opt-level = 0
 
 [dependencies]
-base64 = "0.13.0"
+base64 = "0.20.0"
 bytes = "0.4.9"
 bytes_1 = { version = "1", package = "bytes" }
 chrono = { version = "0.4", features = ["serde"] }
@@ -25,7 +25,7 @@ http = "0.1.10"
 hyper = "0.12.8"
 lazy_static = "1.0"
 mime = "0.3.1"
-minifier = { version = "0.0.20", features = ["html"] }
+minifier = { version = "0.2", features = ["html"] }
 r2d2 = "0.8.2"
 r2d2_sqlite = "0.21.0"
 rusqlite = { version = "0.28.0", features = ["chrono", "functions", "bundled"] }
@@ -35,9 +35,8 @@ reqwest = { version = "0.11", features = ["blocking", "json"] }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-serde_regex = "0.3.0"
-structopt = "0.2"
-structopt-derive = "0.2"
+serde_regex = "1.1.0"
+clap = { version = "4", features = ["derive"] }
 tar = "0.4.36"
 tempfile = "3.0.0"
 tera = "0.11.7"
@@ -46,7 +45,7 @@ url = "2"
 walkdir = "2"
 warp = "0.1.9"
 log = "0.4.6"
-env_logger = "0.9.0"
+env_logger = "0.10.0"
 hmac = "0.12"
 sha-1 = "0.10"
 rust_team_data = { git = "https://github.com/rust-lang/team" }
@@ -56,16 +55,16 @@ percent-encoding = "2.1.0"
 remove_dir_all = "0.7"
 ctrlc = "3.1.3"
 prometheus = "0.7.0"
-cargo_metadata = "0.12.1"
+cargo_metadata = "0.15"
 indexmap = "1.4.0"
 tokio = "1.18"
-aws-types = { version = "0.46", features = ["hardcoded-credentials"] }
-aws-smithy-http = "0.46"
-aws-smithy-async = "0.46"
-aws-sdk-s3 = "0.16"
+aws-types = { version = "0.52", features = ["hardcoded-credentials"] }
+aws-smithy-http = "0.52"
+aws-smithy-async = "0.52"
+aws-sdk-s3 = "0.22"
+thiserror = "1.0.38"
 
 [dev-dependencies]
 assert_cmd = "2.0.4"
 difference = "2.0.0"
-num_cpus = "1.8.0"
-predicates = "1.0.0"
+predicates = "2.0.0"

Cargo.toml

@@ -9,6 +9,7 @@
 //! application state employs ownership techniques to ensure that
 //! parallel access is consistent and race-free.
 
+use clap::Parser;
 use crater::actions::{self, Action, ActionsCtx};
 use crater::agent::{self, Capabilities};
 use crater::config::Config;
@@ -27,7 +28,6 @@ use std::net::SocketAddr;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Duration;
-use structopt::clap::AppSettings;
 
 // An experiment name
 #[derive(Debug, Clone)]
@@ -75,92 +75,70 @@ fn default_capabilities_for_target() -> Capabilities {
     Capabilities::new(caps)
 }
 
-#[derive(structopt_derive::StructOpt)]
+#[derive(Parser)]
 #[allow(clippy::large_enum_variant)]
-#[structopt(
-    name = "crater",
-    about = "Kaboom!",
-    raw(
-        setting = "AppSettings::VersionlessSubcommands",
-        setting = "AppSettings::DeriveDisplayOrder",
-        setting = "AppSettings::SubcommandRequiredElseHelp"
-    )
-)]
+#[clap(name = "crater", about = "Kaboom!")]
 pub enum Crater {
-    #[structopt(
+    #[clap(
         name = "prepare-local",
         about = "acquire toolchains, build containers, build crate lists"
     )]
     PrepareLocal,
 
-    #[structopt(name = "create-lists", about = "create all the lists of crates")]
+    #[clap(name = "create-lists", about = "create all the lists of crates")]
     CreateLists {
-        #[structopt(name = "lists")]
+        #[clap(name = "lists")]
         lists: Vec<String>,
     },
 
-    #[structopt(name = "define-ex", about = "define an experiment")]
+    #[clap(name = "define-ex", about = "define an experiment")]
     DefineEx {
-        #[structopt(name = "experiment", long = "ex", default_value = "default")]
+        #[clap(name = "experiment", long = "ex", default_value = "default")]
         ex: Ex,
-        #[structopt(name = "tc-1")]
+        #[clap(name = "tc-1")]
         tc1: Toolchain,
-        #[structopt(name = "tc-2")]
+        #[clap(name = "tc-2")]
         tc2: Toolchain,
-        #[structopt(
-            name = "mode",
-            long = "mode",
-            raw(
-                default_value = "Mode::BuildAndTest.to_str()",
-                possible_values = "Mode::possible_values()"
-            )
-        )]
+        #[clap(name = "mode", long = "mode", default_value_t = Mode::BuildAndTest)]
         mode: Mode,
-        #[structopt(
+        #[clap(
             name = "crate-select",
             long = "crate-select",
             help = "The set of crates on which the experiment will run.",
             long_help = "The set of crates on which the experiment will run.\n\n\
                          This can be one of (full, demo, random-{d}, top-{d}, local) \
                          where {d} is a positive integer, or \"list:\" followed \
                          by a comma-separated list of crates.",
-            raw(default_value = "\"demo\"",)
+            default_value = "demo"
         )]
         crates: DeferredCrateSelect,
-        #[structopt(
+        #[clap(
             name = "level",
             long = "cap-lints",
-            raw(
-                default_value = "CapLints::Forbid.to_str()",
-                possible_values = "CapLints::possible_values()"
-            )
+            default_value_t = CapLints::Forbid
         )]
         cap_lints: CapLints,
-        #[structopt(name = "priority", long = "priority", short = "p", default_value = "0")]
+        #[clap(name = "priority", long = "priority", short = 'p', default_value = "0")]
         priority: i32,
-        #[structopt(name = "ignore-blacklist", long = "ignore-blacklist")]
+        #[clap(name = "ignore-blacklist", long = "ignore-blacklist")]
         ignore_blacklist: bool,
-        #[structopt(name = "assign", long = "assign")]
+        #[clap(name = "assign", long = "assign")]
         assign: Option<Assignee>,
-        #[structopt(name = "requirement", long = "requirement")]
+        #[clap(name = "requirement", long = "requirement")]
         requirement: Option<String>,
     },
 
-    #[structopt(name = "edit", about = "edit an experiment configuration")]
+    #[clap(name = "edit", about = "edit an experiment configuration")]
     Edit {
-        #[structopt(name = "name")]
+        #[clap(name = "name")]
         name: String,
-        #[structopt(name = "toolchain-start", long = "start")]
+        #[clap(name = "toolchain-start", long = "start")]
         tc1: Option<Toolchain>,
-        #[structopt(name = "toolchain-end", long = "end")]
+        #[clap(name = "toolchain-end", long = "end")]
         tc2: Option<Toolchain>,
-        #[structopt(
-            name = "mode",
-            long = "mode",
-            raw(possible_values = "Mode::possible_values()")
-        )]
+        #[clap(name = "mode", long = "mode")]
         mode: Option<Mode>,
-        #[structopt(
+        #[clap(
             name = "crates",
             long = "crates",
             help = "The set of crates on which the experiment will run.",
@@ -170,131 +148,126 @@ pub enum Crater {
                          by a comma-separated list of crates."
         )]
         crates: Option<DeferredCrateSelect>,
-        #[structopt(
-            name = "cap-lints",
-            long = "cap-lints",
-            raw(possible_values = "CapLints::possible_values()")
-        )]
+        #[clap(name = "cap-lints", long = "cap-lints")]
         cap_lints: Option<CapLints>,
-        #[structopt(name = "priority", long = "priority", short = "p")]
+        #[clap(name = "priority", long = "priority", short = 'p')]
         priority: Option<i32>,
-        #[structopt(
+        #[clap(
             name = "ignore-blacklist",
             long = "ignore-blacklist",
             conflicts_with = "no-ignore-blacklist"
         )]
         ignore_blacklist: bool,
-        #[structopt(
+        #[clap(
             name = "no-ignore-blacklist",
             long = "no-ignore-blacklist",
             conflicts_with = "ignore-blacklist"
         )]
         no_ignore_blacklist: bool,
-        #[structopt(name = "assign", long = "assign")]
+        #[clap(name = "assign", long = "assign")]
         assign: Option<Assignee>,
-        #[structopt(name = "requirement", long = "requirement")]
+        #[clap(name = "requirement", long = "requirement")]
         requirement: Option<String>,
     },
 
-    #[structopt(name = "delete-ex", about = "delete shared data for experiment")]
+    #[clap(name = "delete-ex", about = "delete shared data for experiment")]
     DeleteEx {
-        #[structopt(long = "ex", default_value = "default")]
+        #[clap(long = "ex", default_value = "default")]
         ex: Ex,
     },
 
-    #[structopt(
+    #[clap(
         name = "delete-all-results",
         about = "delete all results for an experiment"
     )]
     DeleteAllResults {
-        #[structopt(name = "experiment", long = "ex", default_value = "default")]
+        #[clap(name = "experiment", long = "ex", default_value = "default")]
         ex: Ex,
     },
 
-    #[structopt(
+    #[clap(
         name = "delete-result",
         about = "delete results for a crate from an experiment"
     )]
     DeleteResult {
-        #[structopt(name = "experiment", long = "ex", default_value = "default")]
+        #[clap(name = "experiment", long = "ex", default_value = "default")]
         ex: Ex,
-        #[structopt(name = "toolchain", long = "toolchain", short = "t")]
+        #[clap(name = "toolchain", long = "toolchain", short = 't')]
         tc: Option<Toolchain>,
-        #[structopt(name = "crate")]
+        #[clap(name = "crate")]
         krate: Crate,
     },
 
-    #[structopt(name = "run-graph", about = "run a parallelized experiment")]
+    #[clap(name = "run-graph", about = "run a parallelized experiment")]
     RunGraph {
-        #[structopt(name = "experiment", long = "ex", default_value = "default")]
+        #[clap(name = "experiment", long = "ex", default_value = "default")]
         ex: Ex,
-        #[structopt(name = "threads", short = "t", long = "threads", default_value = "1")]
+        #[clap(name = "threads", short = 't', long = "threads", default_value = "1")]
         threads: usize,
-        #[structopt(name = "docker-env", long = "docker-env")]
+        #[clap(name = "docker-env", long = "docker-env")]
         docker_env: Option<String>,
-        #[structopt(name = "fast-workspace-init", long = "fast-workspace-init")]
+        #[clap(name = "fast-workspace-init", long = "fast-workspace-init")]
         fast_workspace_init: bool,
     },
 
-    #[structopt(name = "gen-report", about = "generate the experiment report")]
+    #[clap(name = "gen-report", about = "generate the experiment report")]
     GenReport {
-        #[structopt(name = "experiment", long = "ex", default_value = "default")]
+        #[clap(name = "experiment", long = "ex", default_value = "default")]
         ex: Ex,
-        #[structopt(name = "destination")]
+        #[clap(name = "destination")]
         dest: Dest,
-        #[structopt(name = "force", long = "force")]
+        #[clap(name = "force", long = "force")]
         force: bool,
-        #[structopt(name = "output-templates", long = "output-templates")]
+        #[clap(name = "output-templates", long = "output-templates")]
         output_templates: bool,
     },
 
-    #[structopt(name = "server")]
+    #[clap(name = "server")]
     Server {
-        #[structopt(
+        #[clap(
             name = "bind",
             long = "bind",
-            short = "b",
+            short = 'b',
             help = "The address and port to bind to."
         )]
         bind: Option<SocketAddr>,
     },
 
-    #[structopt(name = "agent")]
+    #[clap(name = "agent")]
     Agent {
-        #[structopt(name = "url")]
+        #[clap(name = "url")]
         url: String,
-        #[structopt(name = "token")]
+        #[clap(name = "token")]
         token: String,
-        #[structopt(name = "threads", short = "t", long = "threads", default_value = "1")]
+        #[clap(name = "threads", short = 't', long = "threads", default_value = "1")]
         threads: usize,
-        #[structopt(name = "docker-env", long = "docker-env")]
+        #[clap(name = "docker-env", long = "docker-env")]
         docker_env: Option<String>,
-        #[structopt(name = "fast-workspace-init", long = "fast-workspace-init")]
+        #[clap(name = "fast-workspace-init", long = "fast-workspace-init")]
         fast_workspace_init: bool,
-        #[structopt(
+        #[clap(
             name = "capabilities",
             help = "Registers additional capabilities for this agent.",
             long_help = "Registers additional capabilities for this agent.\n\n \
                          These will be appended to the defaults for this platform, unless those \
                          have been disabled via `--no-default-capabilities`.",
-            long,
-            raw(use_delimiter = "true")
+            long
         )]
         capabilities: Vec<String>,
-        #[structopt(
+        #[clap(
             name = "no-default-capabilities",
             long,
             help = "Disables the default capabilities for this platform."
         )]
         no_default_capabilities: bool,
     },
 
-    #[structopt(
+    #[clap(
         name = "check-config",
         about = "check if the config.toml file is valid"
     )]
     CheckConfig {
-        #[structopt(name = "file")]
+        #[clap(name = "file")]
         filename: Option<String>,
     },
 }

src/cli.rs

@@ -185,14 +185,14 @@ impl fmt::Display for Assignee {
     }
 }
 
-#[derive(Debug, Fail)]
+#[derive(Debug, thiserror::Error)]
 #[cfg_attr(test, derive(PartialEq, Eq))]
 pub enum AssigneeParseError {
-    #[fail(display = "the assignee is empty")]
+    #[error("the assignee is empty")]
     Empty,
-    #[fail(display = "unexpected assignee payload")]
+    #[error("unexpected assignee payload")]
     UnexpectedPayload,
-    #[fail(display = "invalid assignee kind: {}", _0)]
+    #[error("invalid assignee kind: {0}")]
     InvalidKind(String),
 }