diff --git a/crates/aiken/src/cmd/blueprint/address.rs b/crates/aiken/src/cmd/blueprint/address.rs index 4eacfdff..fdf1f386 100644 --- a/crates/aiken/src/cmd/blueprint/address.rs +++ b/crates/aiken/src/cmd/blueprint/address.rs @@ -2,9 +2,8 @@ use crate::with_project; use aiken_lang::ast::Tracing; use std::path::PathBuf; -#[derive(clap::Args)] -#[clap(setting(clap::AppSettings::DeriveDisplayOrder))] /// Compute a validator's address. +#[derive(clap::Args)] pub struct Args { /// Path to project directory: Option, diff --git a/crates/aiken/src/cmd/blueprint/apply.rs b/crates/aiken/src/cmd/blueprint/apply.rs index 8a611b6a..d9d3ff2c 100644 --- a/crates/aiken/src/cmd/blueprint/apply.rs +++ b/crates/aiken/src/cmd/blueprint/apply.rs @@ -7,9 +7,8 @@ use uplc::{ parser, }; -#[derive(clap::Args)] -#[clap(setting(clap::AppSettings::DeriveDisplayOrder))] /// Apply a parameter to a parameterized validator. +#[derive(clap::Args)] pub struct Args { /// Path to project directory: Option, diff --git a/crates/aiken/src/cmd/blueprint/convert.rs b/crates/aiken/src/cmd/blueprint/convert.rs index 41f381b6..f92b8647 100644 --- a/crates/aiken/src/cmd/blueprint/convert.rs +++ b/crates/aiken/src/cmd/blueprint/convert.rs @@ -1,4 +1,4 @@ -use clap::clap_derive::ArgEnum; +use clap::ValueEnum; use miette::IntoDiagnostic; use serde_json::json; use std::{env, fs::File, io::BufReader, path::PathBuf, process}; @@ -10,7 +10,6 @@ use aiken_project::{ /// Convert a blueprint into other formats. #[derive(clap::Args)] -#[clap(setting(clap::AppSettings::DeriveDisplayOrder))] pub struct Args { /// Path to project directory: Option, @@ -24,11 +23,11 @@ pub struct Args { validator: Option, // Format to convert to - #[clap(long, arg_enum, default_value = "cardano-cli")] + #[clap(long, default_value = "cardano-cli")] to: Format, } -#[derive(Copy, Clone, ArgEnum)] +#[derive(Copy, Clone, ValueEnum)] pub enum Format { CardanoCli, } diff --git a/crates/aiken/src/cmd/blueprint/mod.rs b/crates/aiken/src/cmd/blueprint/mod.rs index 9ca6dfb9..3cf959ad 100644 --- a/crates/aiken/src/cmd/blueprint/mod.rs +++ b/crates/aiken/src/cmd/blueprint/mod.rs @@ -6,7 +6,6 @@ use clap::Subcommand; /// Commands for working with Plutus blueprints #[derive(Subcommand)] -#[clap(setting(clap::AppSettings::DeriveDisplayOrder))] pub enum Cmd { Address(address::Args), Apply(apply::Args), diff --git a/crates/aiken/src/cmd/packages/mod.rs b/crates/aiken/src/cmd/packages/mod.rs index 7c72f793..146ddd09 100644 --- a/crates/aiken/src/cmd/packages/mod.rs +++ b/crates/aiken/src/cmd/packages/mod.rs @@ -6,7 +6,6 @@ use clap::Subcommand; /// Managing project dependencies #[derive(Subcommand)] -#[clap(setting(clap::AppSettings::DeriveDisplayOrder))] pub enum Cmd { /// Add a new package dependency Add(add::Args), diff --git a/crates/aiken/src/cmd/tx/mod.rs b/crates/aiken/src/cmd/tx/mod.rs index ae03fece..e2d63a97 100644 --- a/crates/aiken/src/cmd/tx/mod.rs +++ b/crates/aiken/src/cmd/tx/mod.rs @@ -4,7 +4,6 @@ use clap::Subcommand; /// Commands for working with transactions #[derive(Subcommand)] -#[clap(setting(clap::AppSettings::DeriveDisplayOrder))] pub enum Cmd { Simulate(simulate::Args), } diff --git a/crates/aiken/src/cmd/uplc/mod.rs b/crates/aiken/src/cmd/uplc/mod.rs index 3aaa8eb7..edb1c56b 100644 --- a/crates/aiken/src/cmd/uplc/mod.rs +++ b/crates/aiken/src/cmd/uplc/mod.rs @@ -7,7 +7,6 @@ use clap::Subcommand; /// Commands for working with untyped Plutus-core #[derive(Subcommand)] -#[clap(setting(clap::AppSettings::DeriveDisplayOrder))] pub enum Cmd { Fmt(fmt::Args), Eval(eval::Args), diff --git a/crates/aiken/src/main.rs b/crates/aiken/src/main.rs index f3bc0fc4..0b552a9e 100644 --- a/crates/aiken/src/main.rs +++ b/crates/aiken/src/main.rs @@ -10,7 +10,6 @@ use clap::Parser; #[derive(Parser)] #[clap(version, about, long_about = None)] #[clap(propagate_version = true)] -#[clap(setting(clap::AppSettings::DeriveDisplayOrder))] pub enum Cmd { New(new::Args), Fmt(fmt::Args),