waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: some breaking changes from clap v4

This commit is contained in:
rvcas 2023-03-06 13:16:33 -05:00
parent 79c2cb3062
commit c3175e2fc9
No known key found for this signature in database
GPG Key ID: C09B64E263F7D68C
8 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/aiken/src/cmd/blueprint/address.rs
View File

@ -2,9 +2,8 @@ use crate::with_project;
use aiken_lang::ast::Tracing; use aiken_lang::ast::Tracing;
use std::path::PathBuf; use std::path::PathBuf;
#[derive(clap::Args)]
#[clap(setting(clap::AppSettings::DeriveDisplayOrder))]
/// Compute a validator's address. /// Compute a validator's address.
#[derive(clap::Args)]
pub struct Args { pub struct Args {
/// Path to project /// Path to project
directory: Option<PathBuf>, directory: Option<PathBuf>,

3
crates/aiken/src/cmd/blueprint/apply.rs
View File

@ -7,9 +7,8 @@ use uplc::{
parser, parser,
}; };
#[derive(clap::Args)]
#[clap(setting(clap::AppSettings::DeriveDisplayOrder))]
/// Apply a parameter to a parameterized validator. /// Apply a parameter to a parameterized validator.
#[derive(clap::Args)]
pub struct Args { pub struct Args {
/// Path to project /// Path to project
directory: Option<PathBuf>, directory: Option<PathBuf>,

7
crates/aiken/src/cmd/blueprint/convert.rs
View File

@ -1,4 +1,4 @@
use clap::clap_derive::ArgEnum; use clap::ValueEnum;
use miette::IntoDiagnostic; use miette::IntoDiagnostic;
use serde_json::json; use serde_json::json;
use std::{env, fs::File, io::BufReader, path::PathBuf, process}; use std::{env, fs::File, io::BufReader, path::PathBuf, process};
@ -10,7 +10,6 @@ use aiken_project::{
/// Convert a blueprint into other formats. /// Convert a blueprint into other formats.
#[derive(clap::Args)] #[derive(clap::Args)]
#[clap(setting(clap::AppSettings::DeriveDisplayOrder))]
pub struct Args { pub struct Args {
/// Path to project /// Path to project
directory: Option<PathBuf>, directory: Option<PathBuf>,
@ -24,11 +23,11 @@ pub struct Args {
validator: Option<String>, validator: Option<String>,
// Format to convert to // Format to convert to
#[clap(long, arg_enum, default_value = "cardano-cli")] #[clap(long, default_value = "cardano-cli")]
to: Format, to: Format,
} }
#[derive(Copy, Clone, ArgEnum)] #[derive(Copy, Clone, ValueEnum)]
pub enum Format { pub enum Format {
CardanoCli, CardanoCli,
} }

1
crates/aiken/src/cmd/blueprint/mod.rs
View File

@ -6,7 +6,6 @@ use clap::Subcommand;
/// Commands for working with Plutus blueprints /// Commands for working with Plutus blueprints
#[derive(Subcommand)] #[derive(Subcommand)]
#[clap(setting(clap::AppSettings::DeriveDisplayOrder))]
pub enum Cmd { pub enum Cmd {
Address(address::Args), Address(address::Args),
Apply(apply::Args), Apply(apply::Args),

1
crates/aiken/src/cmd/packages/mod.rs
View File

@ -6,7 +6,6 @@ use clap::Subcommand;
/// Managing project dependencies /// Managing project dependencies
#[derive(Subcommand)] #[derive(Subcommand)]
#[clap(setting(clap::AppSettings::DeriveDisplayOrder))]
pub enum Cmd { pub enum Cmd {
/// Add a new package dependency /// Add a new package dependency
Add(add::Args), Add(add::Args),

1
crates/aiken/src/cmd/tx/mod.rs
View File

@ -4,7 +4,6 @@ use clap::Subcommand;
/// Commands for working with transactions /// Commands for working with transactions
#[derive(Subcommand)] #[derive(Subcommand)]
#[clap(setting(clap::AppSettings::DeriveDisplayOrder))]
pub enum Cmd { pub enum Cmd {
Simulate(simulate::Args), Simulate(simulate::Args),
} }

1
crates/aiken/src/cmd/uplc/mod.rs
View File

@ -7,7 +7,6 @@ use clap::Subcommand;
/// Commands for working with untyped Plutus-core /// Commands for working with untyped Plutus-core
#[derive(Subcommand)] #[derive(Subcommand)]
#[clap(setting(clap::AppSettings::DeriveDisplayOrder))]
pub enum Cmd { pub enum Cmd {
Fmt(fmt::Args), Fmt(fmt::Args),
Eval(eval::Args), Eval(eval::Args),

1
crates/aiken/src/main.rs
View File

@ -10,7 +10,6 @@ use clap::Parser;
#[derive(Parser)] #[derive(Parser)]
#[clap(version, about, long_about = None)] #[clap(version, about, long_about = None)]
#[clap(propagate_version = true)] #[clap(propagate_version = true)]
#[clap(setting(clap::AppSettings::DeriveDisplayOrder))]
pub enum Cmd { pub enum Cmd {
New(new::Args), New(new::Args),
Fmt(fmt::Args), Fmt(fmt::Args),