chore: resolve clap 4 deprecated api

Author: tottoto

src/cli.rs

@@ -5,7 +5,7 @@ use volta_core::error::{ExitCode, Fallible};
 use volta_core::session::Session;
 
 #[derive(Parser)]
-#[clap(
+#[command(
     name = "Volta",
     about = "The JavaScript Launcher ⚡",
     long_about = "The JavaScript Launcher ⚡
@@ -14,16 +14,15 @@ use volta_core::session::Session;
     To pin your project's runtime or package manager, use `volta pin`.",
     color = clap::ColorChoice::Auto,
     disable_version_flag = true,
-    dont_collapse_args_in_usage = true,
 )]
 pub(crate) struct Volta {
-    #[clap(subcommand)]
+    #[command(subcommand)]
     pub(crate) command: Option<Subcommand>,
 
-    #[clap(long = "verbose", help = "Enables verbose diagnostics", global = true)]
+    #[arg(long = "verbose", help = "Enables verbose diagnostics", global = true)]
     pub(crate) verbose: bool,
 
-    #[clap(
+    #[arg(
         long = "quiet",
         help = "Prevents unnecessary output",
         global = true,
@@ -32,7 +31,7 @@ pub(crate) struct Volta {
     )]
     pub(crate) quiet: bool,
 
-    #[clap(
+    #[arg(
         short = 'v',
         long = "version",
         help = "Prints the current version of Volta"
@@ -61,27 +60,27 @@ impl Volta {
 #[derive(clap::Subcommand)]
 pub(crate) enum Subcommand {
     /// Fetches a tool to the local machine
-    #[clap(name = "fetch")]
+    #[command(name = "fetch")]
     Fetch(command::Fetch),
 
     /// Installs a tool in your toolchain
-    #[clap(name = "install")]
+    #[command(name = "install")]
     Install(command::Install),
 
     /// Uninstalls a tool from your toolchain
-    #[clap(name = "uninstall")]
+    #[command(name = "uninstall")]
     Uninstall(command::Uninstall),
 
     /// Pins your project's runtime or package manager
-    #[clap(name = "pin")]
+    #[command(name = "pin")]
     Pin(command::Pin),
 
     /// Displays the current toolchain
-    #[clap(name = "list", alias = "ls")]
+    #[command(name = "list", alias = "ls")]
     List(command::List),
 
     /// Generates Volta completions
-    #[clap(
+    #[command(
         name = "completions",
         arg_required_else_help = true,
         long_about = "Generates Volta completions
@@ -97,22 +96,22 @@ otherwise, they will be written to `stdout`.
     Completions(command::Completions),
 
     /// Locates the actual binary that will be called by Volta
-    #[clap(name = "which")]
+    #[command(name = "which")]
     Which(command::Which),
 
-    #[clap(
+    #[command(
         name = "use",
         long_about = crate::command::r#use::USAGE,
         hide = true,
     )]
     Use(command::Use),
 
     /// Enables Volta for the current user / shell
-    #[clap(name = "setup")]
+    #[command(name = "setup")]
     Setup(command::Setup),
 
     /// Run a command with custom Node, npm, pnpm, and/or Yarn versions
-    #[clap(name = "run", allow_hyphen_values = true, trailing_var_arg = true)]
+    #[command(name = "run")]
     Run(command::Run),
 }
 

src/command/completions.rs

@@ -15,15 +15,15 @@ use crate::command::Command;
 #[derive(Debug, clap::Args)]
 pub(crate) struct Completions {
     /// Shell to generate completions for
-    #[clap(index = 1, ignore_case = true, required = true)]
+    #[arg(index = 1, ignore_case = true, required = true)]
     shell: Shell,
 
     /// File to write generated completions to
-    #[clap(short = 'o', long = "output")]
+    #[arg(short = 'o', long = "output")]
     out_file: Option<PathBuf>,
 
     /// Write over an existing file, if any.
-    #[clap(short = 'f', long = "force")]
+    #[arg(short = 'f', long = "force")]
     force: bool,
 }
 

src/command/fetch.rs

@@ -7,7 +7,7 @@ use crate::command::Command;
 #[derive(clap::Args)]
 pub(crate) struct Fetch {
     /// Tools to fetch, like `node`, `yarn@latest` or `your-package@^14.4.3`.
-    #[clap(name = "tool[@version]", required = true)]
+    #[arg(value_name = "tool[@version]", required = true)]
     tools: Vec<String>,
 }
 

src/command/install.rs

@@ -7,7 +7,7 @@ use crate::command::Command;
 #[derive(clap::Args)]
 pub(crate) struct Install {
     /// Tools to install, like `node`, `yarn@latest` or `your-package@^14.4.3`.
-    #[clap(name = "tool[@version]", required = true)]
+    #[arg(value_name = "tool[@version]", required = true)]
     tools: Vec<String>,
 }
 

src/command/list/mod.rs

@@ -205,23 +205,23 @@ pub(crate) struct List {
     // variants (as detailed in commit 5f9214ae).
     /// The tool to lookup - `all`, `node`, `npm`, `yarn`, `pnpm`, or the name
     /// of a package or binary.
-    #[clap(name = "tool")]
+    #[arg(value_name = "tool")]
     subcommand: Option<String>,
 
     /// Specify the output format.
     ///
     /// Defaults to `human` for TTYs, `plain` otherwise.
-    #[clap(long = "format", value_parser = ["human", "plain"])]
+    #[arg(long = "format", value_parser = ["human", "plain"])]
     format: Option<Format>,
 
     /// Show the currently-active tool(s).
     ///
     /// Equivalent to `volta list` when not specifying a specific tool.
-    #[clap(long = "current", short = 'c', conflicts_with = "default")]
+    #[arg(long = "current", short = 'c', conflicts_with = "default")]
     current: bool,
 
     /// Show your default tool(s).
-    #[clap(long = "default", short = 'd', conflicts_with = "current")]
+    #[arg(long = "default", short = 'd', conflicts_with = "current")]
     default: bool,
 }
 

src/command/pin.rs

@@ -7,7 +7,7 @@ use crate::command::Command;
 #[derive(clap::Args)]
 pub(crate) struct Pin {
     /// Tools to pin, like `node@lts` or `yarn@^1.14`.
-    #[clap(name = "tool[@version]", required = true)]
+    #[arg(value_name = "tool[@version]", required = true)]
     tools: Vec<String>,
 }
 

src/command/run.rs

@@ -13,41 +13,42 @@ use volta_core::tool::{node, npm, pnpm, yarn};
 #[derive(Debug, clap::Args)]
 pub(crate) struct Run {
     /// Set the custom Node version
-    #[clap(long = "node", value_name = "version")]
+    #[arg(long = "node", value_name = "version")]
     node: Option<String>,
 
     /// Set the custom npm version
-    #[clap(long = "npm", value_name = "version", conflicts_with = "bundled_npm")]
+    #[arg(long = "npm", value_name = "version", conflicts_with = "bundled_npm")]
     npm: Option<String>,
 
     /// Forces npm to be the version bundled with Node
-    #[clap(long = "bundled-npm", conflicts_with = "npm")]
+    #[arg(long = "bundled-npm", conflicts_with = "npm")]
     bundled_npm: bool,
 
     /// Set the custon pnpm version
-    #[clap(long = "pnpm", value_name = "version", conflicts_with = "no_pnpm")]
+    #[arg(long = "pnpm", value_name = "version", conflicts_with = "no_pnpm")]
     pnpm: Option<String>,
 
     /// Disables pnpm
-    #[clap(long = "no-pnpm", conflicts_with = "pnpm")]
+    #[arg(long = "no-pnpm", conflicts_with = "pnpm")]
     no_pnpm: bool,
 
     /// Set the custom Yarn version
-    #[clap(long = "yarn", value_name = "version", conflicts_with = "no_yarn")]
+    #[arg(long = "yarn", value_name = "version", conflicts_with = "no_yarn")]
     yarn: Option<String>,
 
     /// Disables Yarn
-    #[clap(long = "no-yarn", conflicts_with = "yarn")]
+    #[arg(long = "no-yarn", conflicts_with = "yarn")]
     no_yarn: bool,
 
     /// Set an environment variable (can be used multiple times)
-    #[clap(long = "env", value_name = "NAME=value", number_of_values = 1)]
+    #[arg(long = "env", value_name = "NAME=value", num_args = 1)]
     envs: Vec<String>,
 
     /// The command to run
     command: OsString,
 
     /// Arguments to pass to the command
+    #[arg(allow_hyphen_values = true, trailing_var_arg = true)]
     args: Vec<OsString>,
 }