mirror of
https://github.com/rust-lang/rust
synced 2024-09-21 01:12:48 +00:00
fix clap warnings
Run 'cargo check --features clap/deprecated' and fix warnings
This commit is contained in:
parent
1e4f9e302c
commit
f2d9bfb35f
|
@ -642,22 +642,22 @@ fn pathset_for_paths_removing_matches(
|
|||
|
||||
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
|
||||
pub enum Kind {
|
||||
#[clap(alias = "b")]
|
||||
#[value(alias = "b")]
|
||||
Build,
|
||||
#[clap(alias = "c")]
|
||||
#[value(alias = "c")]
|
||||
Check,
|
||||
Clippy,
|
||||
Fix,
|
||||
Format,
|
||||
#[clap(alias = "t")]
|
||||
#[value(alias = "t")]
|
||||
Test,
|
||||
Bench,
|
||||
#[clap(alias = "d")]
|
||||
#[value(alias = "d")]
|
||||
Doc,
|
||||
Clean,
|
||||
Dist,
|
||||
Install,
|
||||
#[clap(alias = "r")]
|
||||
#[value(alias = "r")]
|
||||
Run,
|
||||
Setup,
|
||||
Suggest,
|
||||
|
|
|
@ -31,7 +31,7 @@ pub enum Warnings {
|
|||
|
||||
/// Deserialized version of all flags for this compile.
|
||||
#[derive(Debug, Parser)]
|
||||
#[clap(
|
||||
#[command(
|
||||
override_usage = "x.py <subcommand> [options] [<paths>...]",
|
||||
disable_help_subcommand(true),
|
||||
about = "",
|
||||
|
@ -118,7 +118,7 @@ pub struct Flags {
|
|||
// This overrides the deny-warnings configuration option,
|
||||
// which passes -Dwarnings to the compiler invocations.
|
||||
#[arg(global(true), long)]
|
||||
#[clap(value_enum, default_value_t=Warnings::Default, value_name = "deny|warn")]
|
||||
#[arg(value_enum, default_value_t=Warnings::Default, value_name = "deny|warn")]
|
||||
/// if value is deny, will deny warnings
|
||||
/// if value is warn, will emit warnings
|
||||
/// otherwise, use the default configured behaviour
|
||||
|
@ -132,7 +132,7 @@ pub struct Flags {
|
|||
pub json_output: bool,
|
||||
|
||||
#[arg(global(true), long, value_name = "STYLE")]
|
||||
#[clap(value_enum, default_value_t = Color::Auto)]
|
||||
#[arg(value_enum, default_value_t = Color::Auto)]
|
||||
/// whether to use color in cargo and rustc output
|
||||
pub color: Color,
|
||||
|
||||
|
@ -188,7 +188,7 @@ pub fn parse(args: &[String]) -> Self {
|
|||
let it = std::iter::once(&first).chain(args.iter());
|
||||
// We need to check for `<cmd> -h -v`, in which case we list the paths
|
||||
#[derive(Parser)]
|
||||
#[clap(disable_help_flag(true))]
|
||||
#[command(disable_help_flag(true))]
|
||||
struct HelpVerboseOnly {
|
||||
#[arg(short, long)]
|
||||
help: bool,
|
||||
|
@ -218,7 +218,7 @@ struct HelpVerboseOnly {
|
|||
|
||||
#[derive(Debug, Clone, Default, clap::Subcommand)]
|
||||
pub enum Subcommand {
|
||||
#[clap(aliases = ["b"], long_about = "\n
|
||||
#[command(aliases = ["b"], long_about = "\n
|
||||
Arguments:
|
||||
This subcommand accepts a number of paths to directories to the crates
|
||||
and/or artifacts to compile. For example, for a quick build of a usable
|
||||
|
@ -233,7 +233,7 @@ pub enum Subcommand {
|
|||
/// Compile either the compiler or libraries
|
||||
#[default]
|
||||
Build,
|
||||
#[clap(aliases = ["c"], long_about = "\n
|
||||
#[command(aliases = ["c"], long_about = "\n
|
||||
Arguments:
|
||||
This subcommand accepts a number of paths to directories to the crates
|
||||
and/or artifacts to compile. For example:
|
||||
|
@ -246,7 +246,7 @@ pub enum Subcommand {
|
|||
all_targets: bool,
|
||||
},
|
||||
/// Run Clippy (uses rustup/cargo-installed clippy binary)
|
||||
#[clap(long_about = "\n
|
||||
#[command(long_about = "\n
|
||||
Arguments:
|
||||
This subcommand accepts a number of paths to directories to the crates
|
||||
and/or artifacts to run clippy against. For example:
|
||||
|
@ -273,14 +273,14 @@ pub enum Subcommand {
|
|||
forbid: Vec<String>,
|
||||
},
|
||||
/// Run cargo fix
|
||||
#[clap(long_about = "\n
|
||||
#[command(long_about = "\n
|
||||
Arguments:
|
||||
This subcommand accepts a number of paths to directories to the crates
|
||||
and/or artifacts to run `cargo fix` against. For example:
|
||||
./x.py fix library/core
|
||||
./x.py fix library/core library/proc_macro")]
|
||||
Fix,
|
||||
#[clap(
|
||||
#[command(
|
||||
name = "fmt",
|
||||
long_about = "\n
|
||||
Arguments:
|
||||
|
@ -295,7 +295,7 @@ pub enum Subcommand {
|
|||
#[arg(long)]
|
||||
check: bool,
|
||||
},
|
||||
#[clap(aliases = ["d"], long_about = "\n
|
||||
#[command(aliases = ["d"], long_about = "\n
|
||||
Arguments:
|
||||
This subcommand accepts a number of paths to directories of documentation
|
||||
to build. For example:
|
||||
|
@ -316,7 +316,7 @@ pub enum Subcommand {
|
|||
/// render the documentation in JSON format in addition to the usual HTML format
|
||||
json: bool,
|
||||
},
|
||||
#[clap(aliases = ["t"], long_about = "\n
|
||||
#[command(aliases = ["t"], long_about = "\n
|
||||
Arguments:
|
||||
This subcommand accepts a number of paths to test directories that
|
||||
should be compiled and run. For example:
|
||||
|
@ -400,7 +400,7 @@ pub enum Subcommand {
|
|||
Dist,
|
||||
/// Install distribution artifacts
|
||||
Install,
|
||||
#[clap(aliases = ["r"], long_about = "\n
|
||||
#[command(aliases = ["r"], long_about = "\n
|
||||
Arguments:
|
||||
This subcommand accepts a number of paths to tools to build and run. For
|
||||
example:
|
||||
|
@ -413,7 +413,7 @@ pub enum Subcommand {
|
|||
args: Vec<String>,
|
||||
},
|
||||
/// Set up the environment for development
|
||||
#[clap(long_about = format!(
|
||||
#[command(long_about = format!(
|
||||
"\n
|
||||
x.py setup creates a `config.toml` which changes the defaults for x.py itself,
|
||||
as well as setting up a git pre-push hook, VS Code config and toolchain link.
|
||||
|
@ -434,7 +434,7 @@ pub enum Subcommand {
|
|||
profile: Option<PathBuf>,
|
||||
},
|
||||
/// Suggest a subset of tests to run, based on modified files
|
||||
#[clap(long_about = "\n")]
|
||||
#[command(long_about = "\n")]
|
||||
Suggest {
|
||||
/// run suggested tests
|
||||
#[arg(long)]
|
||||
|
|
Loading…
Reference in a new issue