Updated deps

Author: Heliozoa

Cargo.lock

@@ -16,8 +16,8 @@ rust-version = "1.58.1"
 
 [dependencies]
 anyhow = "1.0.56"
-clap = "3.1.6"
-clap_complete = "3.1.1"
+clap = "4.0.7"
+clap_complete = "4.0.2"
 crossterm = "0.25.0"
 indicatif = "0.17.1"
 reqwest = { version = "0.11.9", default-features = false, features = [
@@ -41,5 +41,5 @@ assert_cmd = "2.0.4"
 predicates = "2.1.1"
 
 [build-dependencies]
-clap = "3.1.6"
-clap_complete = "3.1.1"
+clap = "4.0.7"
+clap_complete = "4.0.2"

Cargo.toml

@@ -1,6 +1,6 @@
-use clap::{AppSettings, Arg, Command};
+use clap::{Arg, Command};
 
-pub fn build_cli() -> Command<'static> {
+pub fn build_cli() -> Command {
     Command::new(env!("CARGO_PKG_NAME"))
         .version(env!("CARGO_PKG_VERSION"))
         .about(env!("CARGO_PKG_DESCRIPTION"))
@@ -120,7 +120,6 @@ pub fn build_cli() -> Command<'static> {
                 .about("Generate completion scripts for command line usage.")
                 .disable_version_flag(true)
                 .hide(true)
-                .setting(AppSettings::DeriveDisplayOrder)
                 .arg(Arg::new("bash").short('b').long("bash"))
                 .arg(Arg::new("zsh").short('z').long("zsh"))
                 .arg(Arg::new("powershell").short('p').long("powershell")),

src/cli.rs

@@ -15,7 +15,7 @@ use anyhow::Context;
 use util::{Client, ClientProduction};
 
 pub fn handle(matches: &clap::ArgMatches, io: &mut dyn Io) -> anyhow::Result<()> {
-    let mut client = ClientProduction::new(matches.is_present("testmode"))?;
+    let mut client = ClientProduction::new(matches.contains_id("testmode"))?;
 
     // Authorize the client and raise error if not logged in when required
     match matches.subcommand() {
@@ -39,38 +39,38 @@ pub fn handle(matches: &clap::ArgMatches, io: &mut dyn Io) -> anyhow::Result<()>
 
     match matches.subcommand() {
         Some(("login", args)) => {
-            let interactive_mode = !args.is_present("non-interactive");
+            let interactive_mode = !args.contains_id("non-interactive");
             login::login(io, &mut client, interactive_mode)?;
         }
         Some(("download", args)) => download::download_or_update(
             io,
             &mut client,
-            args.value_of("course"),
-            args.is_present("currentdir"),
+            args.get_one("course").copied(),
+            args.contains_id("currentdir"),
         )?,
         Some(("update", args)) => {
-            update::update(io, &mut client, args.is_present("currentdir"))?;
+            update::update(io, &mut client, args.contains_id("currentdir"))?;
         }
         Some(("organization", args)) => {
-            let interactive_mode = !args.is_present("non-interactive");
+            let interactive_mode = !args.contains_id("non-interactive");
             organization::organization(io, &mut client, interactive_mode)?
         }
         Some(("courses", _)) => courses::list_courses(io, &mut client)?,
         Some(("submit", args)) => {
-            submit::submit(io, &mut client, args.value_of("exercise"))?;
+            submit::submit(io, &mut client, args.get_one("exercise").copied())?;
         }
         Some(("exercises", args)) => {
-            if let Some(c) = args.value_of("course") {
+            if let Some(c) = args.get_one("course").copied() {
                 exercises::list_exercises(io, &mut client, c)?;
             } else {
                 io.println("argument for course not found", PrintColor::Normal)?;
             }
         }
         Some(("test", args)) => {
-            test::test(io, args.value_of("exercise"))?;
+            test::test(io, args.get_one("exercise").copied())?;
         }
         Some(("paste", args)) => {
-            paste::paste(io, &mut client, args.value_of("exercise"))?;
+            paste::paste(io, &mut client, args.get_one("exercise").copied())?;
         }
         Some(("logout", _)) => logout::logout(io, &mut client)?,
         Some(("fetchupdate", _)) => {

src/commands.rs

@@ -34,7 +34,7 @@ fn main() {
         &mut buffer,
         &mut stdout,
         &mut stdin,
-        matches.is_present("testmode"),
+        matches.contains_id("testmode"),
     );
     if let Err(err) = run(&mut io, &matches) {
         let error_string = err
@@ -49,7 +49,7 @@ fn main() {
 }
 
 fn run(io: &mut IoProduction, matches: &ArgMatches) -> anyhow::Result<()> {
-    match matches.occurrences_of("no-update") {
+    match matches.get_count("no-update") {
         0 => {
             let os = std::env::consts::OS;
             if os == "windows" {
@@ -63,11 +63,11 @@ fn run(io: &mut IoProduction, matches: &ArgMatches) -> anyhow::Result<()> {
 }
 
 fn generate_completions(matches: &ArgMatches) {
-    let shell = if matches.is_present("bash") {
+    let shell = if matches.contains_id("bash") {
         Shell::Bash
-    } else if matches.is_present("zsh") {
+    } else if matches.contains_id("zsh") {
         Shell::Zsh
-    } else if matches.is_present("powershell") {
+    } else if matches.contains_id("powershell") {
         Shell::PowerShell
     } else {
         return;