From b4b121d3a41282405cfa581a13b065c10a9de520 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 26 Aug 2022 13:29:10 -0500 Subject: [PATCH] fix(derive): Remove deprecated arg_enum attribute --- CHANGELOG.md | 1 + clap_complete/examples/completion-derive.rs | 2 +- clap_derive/src/parse.rs | 1 - examples/tutorial_derive/04_01_enum.rs | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b7871c8cdd..579d299efc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - *(env)* Parse `--help` and `--version` like any `ArgAction::SetTrue` flag (#3776) - *(derive)* Changed the default for arguments from `parse` to `value_parser`., removing `parse` support - *(derive)* `subcommand_required(true).arg_required_else_help(true)` is set instead of `SubcommandRequiredElseHelp` (#3280) +- *(derive)* Remove `arg_enum` attribute in favor of `value_enum` ### Compatibility diff --git a/clap_complete/examples/completion-derive.rs b/clap_complete/examples/completion-derive.rs index b988aca0f16..b41e9b69d3a 100644 --- a/clap_complete/examples/completion-derive.rs +++ b/clap_complete/examples/completion-derive.rs @@ -26,7 +26,7 @@ use std::path::PathBuf; )] struct Opt { /// If provided, outputs the completion file for given shell - #[clap(long = "generate", arg_enum)] + #[clap(long = "generate", value_enum)] generator: Option, // Showcasing all possible ValueHints: #[clap(long, value_hint = ValueHint::Unknown)] diff --git a/clap_derive/src/parse.rs b/clap_derive/src/parse.rs index d7d4868d9ca..45e24d08d97 100644 --- a/clap_derive/src/parse.rs +++ b/clap_derive/src/parse.rs @@ -155,7 +155,6 @@ impl Parse for ClapAttr { "action" => Ok(Action(name)), "env" => Ok(Env(name)), "flatten" => Ok(Flatten(name)), - "arg_enum" => Ok(ValueEnum(name)), "value_enum" => Ok(ValueEnum(name)), "from_global" => Ok(FromGlobal(name)), "subcommand" => Ok(Subcommand(name)), diff --git a/examples/tutorial_derive/04_01_enum.rs b/examples/tutorial_derive/04_01_enum.rs index bd23a59b133..2f543a1e630 100644 --- a/examples/tutorial_derive/04_01_enum.rs +++ b/examples/tutorial_derive/04_01_enum.rs @@ -4,7 +4,7 @@ use clap::{Parser, ValueEnum}; #[clap(author, version, about, long_about = None)] struct Cli { /// What mode to run the program in - #[clap(arg_enum)] + #[clap(value_enum)] mode: Mode, }