slipenkomk/sequoia-sq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve naming.

Browse Source 
- Rename the user ID designator types to make them a bit clearer.
This commit is contained in:
Neal H. Walfield 2024-11-13 15:27:08 +01:00
parent ae36aaccf0
commit 75dcd33193
No known key found for this signature in database
GPG Key ID: 6863C9AD5B4D22D3
4 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cli/pki/link.rs
View File

@ -173,7 +173,7 @@ pub struct AddCommand {
#[command(flatten)]
pub userids: UserIDDesignators<
userid_designator::AllExistingAndAddArgs>,
userid_designator::AllExistingAndAddXUserIDEmailArgs>,
#[clap(
long = "amount",
@ -341,7 +341,7 @@ pub struct AuthorizeCommand {
#[command(flatten)]
pub userids: UserIDDesignators<
userid_designator::AllExistingAndAddArgs,
userid_designator::AllExistingAndAddXUserIDEmailArgs,
userid_designator::OptionalValue>,
#[clap(
@ -535,7 +535,7 @@ to force the signature to be re-created anyway.",
#[command(flatten)]
pub userids: UserIDDesignators<
userid_designator::AnyArgs,
userid_designator::AnyUserIDEmailArgs,
userid_designator::OptionalValue>,
}

2
src/cli/pki/vouch/authorize.rs
View File

@ -108,7 +108,7 @@ pub struct Command {
#[command(flatten)]
pub userids: UserIDDesignators<
userid_designator::ExistingAndAddArgs,
userid_designator::ExistingAndAddXUserIDEmailArgs,
userid_designator::OptionalValue>,
#[clap(

2
src/cli/pki/vouch/certify.rs
View File

@ -98,7 +98,7 @@ pub struct Command {
#[command(flatten)]
pub userids: UserIDDesignators<
userid_designator::ExistingAndAddArgs>,
userid_designator::ExistingAndAddXUserIDEmailArgs>,
#[clap(
long = "amount",

44
src/cli/types/userid_designator.rs
View File

@ -37,26 +37,28 @@ pub type AddEmailArg = typenum::U64;
/// Enables --userid, and --email (but not --add-userid or
/// --add-email).
pub type ExistingArgs
pub type ExistingUserIDEmailArgs
= <ExistingUserIDArg as std::ops::BitOr<ExistingEmailArg>>::Output;
/// Enables --userid, and --email (but not --add-userid or
/// --add-email).
pub type AnyArgs
pub type AnyUserIDEmailArgs
= <AnyUserIDArg as std::ops::BitOr<AnyEmailArg>>::Output;
/// Enables --add-userid, and --add-email (but not --userid or
/// --email).
pub type AddArgs
pub type AddUserIDEmailArgs
= <AddUserIDArg as std::ops::BitOr<AddEmailArg>>::Output;
/// Enables --userid, --email, --add-userid, and --add-email.
pub type ExistingAndAddArgs
= <ExistingArgs as std::ops::BitOr<AddArgs>>::Output;
pub type ExistingAndAddXUserIDEmailArgs
= <ExistingUserIDEmailArgs
as std::ops::BitOr<AddUserIDEmailArgs>>::Output;
/// Enables --all, --userid, --email, --add-userid, and --add-email.
pub type AllExistingAndAddArgs
= <AllUserIDsArg as std::ops::BitOr<ExistingAndAddArgs>>::Output;
pub type AllExistingAndAddXUserIDEmailArgs
= <AllUserIDsArg
as std::ops::BitOr<ExistingAndAddXUserIDEmailArgs>>::Output;
/// Argument parser options.
@ -668,17 +670,17 @@ mod test {
}
// No Args.
check!(typenum::U0, false, false, false, false, false, false);
check!(ExistingUserIDArg, true, false, false, false, false, false);
check!(ExistingEmailArg, false, true, false, false, false, false);
check!(ExistingArgs, true, true, false, false, false, false);
check!(AnyUserIDArg, false, false, true, false, false, false);
check!(AnyEmailArg, false, false, false, true, false, false);
check!(AnyArgs, false, false, true, true, false, false);
check!(AddUserIDArg, false, false, false, false, true, false);
check!(AddEmailArg, false, false, false, false, false, true);
check!(AddArgs, false, false, false, false, true, true);
check!(ExistingAndAddArgs, true, true, false, false, true, true);
check!(typenum::U0, false, false, false, false, false, false);
check!(ExistingUserIDArg, true, false, false, false, false, false);
check!(ExistingEmailArg, false, true, false, false, false, false);
check!(ExistingUserIDEmailArgs, true, true, false, false, false, false);
check!(AnyUserIDArg, false, false, true, false, false, false);
check!(AnyEmailArg, false, false, false, true, false, false);
check!(AnyUserIDEmailArgs, false, false, true, true, false, false);
check!(AddUserIDArg, false, false, false, false, true, false);
check!(AddEmailArg, false, false, false, false, false, true);
check!(AddUserIDEmailArgs, false, false, false, false, true, true);
check!(ExistingAndAddXUserIDEmailArgs, true, true, false, false, true, true);
}
#[test]
@ -691,7 +693,7 @@ mod test {
#[clap(name = "prog")]
struct CLI {
#[command(flatten)]
pub userids: UserIDDesignators<ExistingArgs,
pub userids: UserIDDesignators<ExistingUserIDEmailArgs,
OneValue>,
}
@ -739,7 +741,7 @@ mod test {
#[clap(name = "prog")]
struct CLI {
#[command(flatten)]
pub userids: UserIDDesignators<ExistingArgs,
pub userids: UserIDDesignators<ExistingUserIDEmailArgs,
OptionalValue>,
}
@ -793,7 +795,7 @@ mod test {
#[clap(name = "prog")]
struct CLI {
#[command(flatten)]
pub userids: UserIDDesignators<AllExistingAndAddArgs>,
pub userids: UserIDDesignators<AllExistingAndAddXUserIDEmailArgs>,
}
let command = CLI::command();