Merge #405

405: Update deps r=MikailBag a=MikailBag



Co-authored-by: Mikail Bagishov <[email protected]>

Author: bors[bot]

Cargo.lock

@@ -9,19 +9,19 @@ description = "JJS CLI client"
 util = {path = "../util"}
 client = {path = "../client"}
 pom = { path = "../pom" }
-base64 = "0.12.3"
-serde_json = "1.0.57"
-serde = "1.0.115"
-futures = { version = "0.3.5", features = ["compat"] }
+base64 = "0.13.0"
+serde_json = "1.0.59"
+serde = "1.0.117"
+futures = { version = "0.3.7", features = ["compat"] }
 tokio = { version = "0.2.22", features = ["macros", "rt-core", "io-std", "process"] }
 log = "0.4.11"
-anyhow = "1.0.32"
-clap = "3.0.0-beta.1"
-either = "1.6.0"
-clap_generate = "3.0.0-beta.1"
-dialoguer = "0.6.2"
+anyhow = "1.0.33"
+clap = "3.0.0-beta.2"
+either = "1.6.1"
+clap_generate = "3.0.0-beta.2"
+dialoguer = "0.7.1"
 xdg = "2.2.0"
-serde_yaml = "0.8.13"
+serde_yaml = "0.8.14"
 tar = "0.4.30"
 humansize = "1.1.0"
-flate2 = "1.0.17"
+flate2 = "1.0.18"

src/cli/Cargo.toml

@@ -11,7 +11,7 @@ pub(crate) struct Opt {
 }
 
 fn generate<G: clap_generate::Generator>() {
-    let mut app: clap::App = <crate::Opt as clap::derive::IntoApp>::into_app();
+    let mut app: clap::App = <crate::Opt as clap::IntoApp>::into_app();
     clap_generate::generate::<G, _>(&mut app, "jjs-cli", &mut std::io::stdout());
 }
 

src/cli/src/completion.rs

@@ -4,7 +4,7 @@ use client::prelude::Sendable as _;
 pub struct Opt {
     /// Action: view, remove or rejudge
     action: String,
-    #[clap(long = "filter", short = "f", default_value = "true")]
+    #[clap(long = "filter", short = 'f', default_value = "true")]
     _filter: String,
 }
 

src/cli/src/runs.rs

@@ -4,16 +4,16 @@ use either::Either;
 #[derive(clap::Clap)]
 pub struct Opt {
     /// problem code, e.g. "A"
-    #[clap(long, short = "p")]
+    #[clap(long, short = 'p')]
     problem: String,
-    #[clap(long, short = "t")]
+    #[clap(long, short = 't')]
     toolchain: String,
-    #[clap(long, short = "f")]
+    #[clap(long, short = 'f')]
     filename: String,
-    #[clap(long, short = "c")]
+    #[clap(long, short = 'c')]
     contest: String,
     /// Watch for judging finish
-    #[clap(long, short = "w")]
+    #[clap(long, short = 'w')]
     watch: bool,
 }
 

src/cli/src/submit.rs

@@ -6,15 +6,15 @@ edition = "2018"
 
 [dependencies]
 openapi = {path = "../gen-api-client"}
-hyper = "0.13.7"
+hyper = "0.13.8"
 tokio = "0.2.22"
-serde_json = "1.0.57"
+serde_json = "1.0.59"
 http = "0.2.1"
-async-trait = "0.1.40"
-anyhow = "1.0.32"
-serde = "1.0.115"
+async-trait = "0.1.41"
+anyhow = "1.0.33"
+serde = "1.0.117"
 url = "2.1.1"
-serde_yaml = "0.8.13"
+serde_yaml = "0.8.14"
 xdg = "2.2.0"
-tracing = "0.1.19"
+tracing = "0.1.21"
 tracing-futures = "0.2.4"

src/client/Cargo.toml

@@ -5,15 +5,15 @@ authors = ["Mikail Bagishov <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-structopt = "0.3.17"
-serde = { version = "1.0.115", features = ["derive"] }
+clap = "3.0.0-beta.2"
+serde = { version = "1.0.117", features = ["derive"] }
 log = "0.4.11"
-env_logger = "0.7.1"
+env_logger = "0.8.1"
 ignore = "0.4.16"
-toml = "0.5.6"
+toml = "0.5.7"
 atty = "0.2.14"
 util = {path = "../util"}
 lazy_static = "1.4.0"
-anyhow = "1.0.32"
-serde_json = "1.0.57"
+anyhow = "1.0.33"
+serde_json = "1.0.59"
 tempfile = "3.1.0"

src/devtool/Cargo.toml

@@ -1,27 +1,27 @@
 use crate::ci::{detect_build_type, DeployKind};
+use clap::Clap;
 use std::process::Command;
-use structopt::StructOpt;
 use util::cmd::{CommandExt, Runner};
 
-#[derive(StructOpt)]
+#[derive(Clap)]
 pub(crate) struct RawBuildOpts {
     /// enable things that are not required for running tests
-    #[structopt(long)]
+    #[clap(long)]
     full: bool,
     /// Enable docker
-    #[structopt(long)]
+    #[clap(long)]
     docker: bool,
     /// Setup (useful for development)
-    #[structopt(long)]
+    #[clap(long)]
     setup: bool,
     /// Debian packages
-    #[structopt(long)]
+    #[clap(long)]
     deb: bool,
     /// Additional options to pass to configure
-    #[structopt(long = "configure-opt")]
+    #[clap(long = "configure-opt")]
     configure: Vec<String>,
     /// Build all docs
-    #[structopt(long)]
+    #[clap(long)]
     docs: bool,
 }
 

src/devtool/src/build.rs

@@ -1,7 +1,7 @@
 use anyhow::Context as _;
+use clap::Clap;
 use log::{debug, info};
 use std::process::Command;
-use structopt::StructOpt;
 use util::cmd::{CommandExt, Runner};
 
 fn cmake_bin() -> &'static str {
@@ -83,25 +83,25 @@ fn check_testlib(runner: &Runner) {
         .run_on(runner);
 }
 
-#[derive(StructOpt)]
+#[derive(Clap)]
 pub struct CheckOpts {
     /// Run autopep8
-    #[structopt(long)]
+    #[clap(long)]
     autopep8: bool,
     /// Run shellcheck
-    #[structopt(long)]
+    #[clap(long)]
     shellcheck: bool,
     /// Build testlib
-    #[structopt(long)]
+    #[clap(long)]
     testlib: bool,
     /// Analyze testlib
-    #[structopt(long)]
+    #[clap(long)]
     clang_analyzer: bool,
     /// Do not run default checks
-    #[structopt(long)]
+    #[clap(long)]
     no_default: bool,
     /// Exit with status 1 as soon as any invoked command fails
-    #[structopt(long)]
+    #[clap(long)]
     pub(crate) fail_fast: bool,
 }
 

src/devtool/src/check.rs

@@ -70,20 +70,16 @@ pub struct BuildInfo {
 
 impl BuildInfo {
     pub fn is_deploy(&self) -> bool {
-        match self.ty {
-            BuildType::Deploy(_) => true,
-            _ => false,
-        }
+        matches!(self.ty, BuildType::Deploy(_))
     }
 
     pub fn is_pr_e2e(&self) -> bool {
-        match self.ty {
+        matches!(self.ty,
             BuildType::Check {
                 ty: CheckJobType::EndToEnd,
                 ..
-            } => true,
-            _ => false,
-        }
+            }
+        )
     }
 
     pub fn deploy_info(&self) -> Option<DeployKind> {
@@ -154,10 +150,7 @@ fn do_detect_build_type() -> BuildType {
     };
 
     let job_ty = CheckJobType::detect().expect("failed to detech check job");
-    let privileged = match branch_name {
-        "trying" | "staging" | "master" => true,
-        _ => false,
-    };
+    let privileged = matches!(branch_name, "trying" | "staging" | "master");
     BuildType::Check {
         ty: job_ty,
         privileged,