diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | mingling/Cargo.toml | 2 | ||||
| -rw-r--r-- | mingling/src/lib.rs | 2 | ||||
| -rw-r--r-- | mingling_core/Cargo.toml | 2 | ||||
| -rw-r--r-- | mingling_core/src/program/config.rs | 6 | ||||
| -rw-r--r-- | mingling_macros/Cargo.toml | 2 | ||||
| -rw-r--r-- | mingling_macros/src/lib.rs | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e26d20d..2f34e1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ #### Features: -1. **\[macros\]** Completed the `clap_parser` feature: **Mingling** now supports parsing input using `clap::Parser` +1. **\[macros\]** Completed the `clap` feature: **Mingling** now supports parsing input using `clap::Parser` ```rust #[derive(Groupped, clap::Parser)] @@ -22,7 +22,7 @@ struct YourCommandEntry { } ``` -2. **\[clap_parser\]** Added the `stdout_setting.clap_help_print_behaviour` configuration item to `Program`, used to control the behavior of Clap Help +2. **\[clap\]** Added the `stdout_setting.clap_help_print_behaviour` configuration item to `Program`, used to control the behavior of Clap Help 3. **\[core\]** Added function `new_with_args` to `Program` 4. **\[core\]** Added function `dispatch_args_dynamic` to `Program` diff --git a/mingling/Cargo.toml b/mingling/Cargo.toml index 47d3109..4977a4d 100644 --- a/mingling/Cargo.toml +++ b/mingling/Cargo.toml @@ -21,7 +21,7 @@ async = ["mingling_core/async", "mingling_macros/async"] default = ["mingling_core/default"] -clap_parser = ["mingling_core/clap_parser", "mingling_macros/clap_parser"] +clap = ["mingling_core/clap", "mingling_macros/clap"] full = ["mingling_core/full", "mingling_macros/full", "comp", "parser"] general_renderer = [ "mingling_core/general_renderer", diff --git a/mingling/src/lib.rs b/mingling/src/lib.rs index 5240682..7496d9d 100644 --- a/mingling/src/lib.rs +++ b/mingling/src/lib.rs @@ -80,7 +80,7 @@ pub mod macros { /// Used to create a dispatcher that routes to a `Chain` pub use mingling_macros::dispatcher; /// Used to create a dispatcher with clap argument parsing - #[cfg(feature = "clap_parser")] + #[cfg(feature = "clap")] pub use mingling_macros::dispatcher_clap; /// Used to collect data and create a command-line context pub use mingling_macros::gen_program; diff --git a/mingling_core/Cargo.toml b/mingling_core/Cargo.toml index b13d3d3..83db3af 100644 --- a/mingling_core/Cargo.toml +++ b/mingling_core/Cargo.toml @@ -12,7 +12,7 @@ async = [] full = ["comp", "general_renderer"] -clap_parser = [] +clap = [] comp = ["dep:just_template"] debug = ["dep:log", "dep:env_logger"] general_renderer = [ diff --git a/mingling_core/src/program/config.rs b/mingling_core/src/program/config.rs index 78c6185..dcab526 100644 --- a/mingling_core/src/program/config.rs +++ b/mingling_core/src/program/config.rs @@ -7,12 +7,12 @@ pub struct ProgramStdoutSetting { /// Render results and output pub render_output: bool, - #[cfg(feature = "clap_parser")] + #[cfg(feature = "clap")] /// Behavior when Clap Dispatcher outputs help information pub clap_help_print_behaviour: ClapHelpPrintBehaviour, } -#[cfg(feature = "clap_parser")] +#[cfg(feature = "clap")] #[derive(Debug, Default, Clone)] pub enum ClapHelpPrintBehaviour { /// Write to RenderResult @@ -28,7 +28,7 @@ impl Default for ProgramStdoutSetting { ProgramStdoutSetting { error_output: true, render_output: true, - #[cfg(feature = "clap_parser")] + #[cfg(feature = "clap")] clap_help_print_behaviour: ClapHelpPrintBehaviour::default(), } } diff --git a/mingling_macros/Cargo.toml b/mingling_macros/Cargo.toml index 1a578a5..4863ab9 100644 --- a/mingling_macros/Cargo.toml +++ b/mingling_macros/Cargo.toml @@ -15,7 +15,7 @@ async = [] full = ["comp", "general_renderer"] -clap_parser = [] +clap = [] comp = [] general_renderer = [] diff --git a/mingling_macros/src/lib.rs b/mingling_macros/src/lib.rs index dbbc333..58d4e28 100644 --- a/mingling_macros/src/lib.rs +++ b/mingling_macros/src/lib.rs @@ -15,7 +15,7 @@ mod chain; #[cfg(feature = "comp")] mod completion; mod dispatcher; -#[cfg(feature = "clap_parser")] +#[cfg(feature = "clap")] mod dispatcher_clap; mod enum_tag; mod groupped; @@ -94,7 +94,7 @@ pub fn program_setup(attr: TokenStream, item: TokenStream) -> TokenStream { program_setup::setup_attr(attr, item) } -#[cfg(feature = "clap_parser")] +#[cfg(feature = "clap")] #[proc_macro_attribute] pub fn dispatcher_clap(attr: TokenStream, item: TokenStream) -> TokenStream { dispatcher_clap::dispatcher_clap_attr(attr, item) |