topjohnwu/argh
1
0
Fork 0
mirror of https://github.com/topjohnwu/argh.git synced 2025-02-17 02:07:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change from_str_fn to take expression paths

Browse Source 
This changes `from_str_fn` to take expression paths, rather than simple
idents. This makes it easier to use functions from external modules,
or with static methods.
This commit is contained in:
Erick Tryzelaar 2023-08-08 12:34:07 -07:00 committed by Erick Tryzelaar
parent a05e92f2f1
commit e8efc8285f
5 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
argh/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "argh"
version = "0.1.11"
version = "0.1.12"
authors = ["Taylor Cramer <cramertj@google.com>", "Benjamin Brittain <bwb@google.com>", "Erick Tryzelaar <etryzelaar@google.com>"]
edition = "2018"
keywords = ["args", "arguments", "derive", "cli"]
@ -10,8 +10,8 @@ repository = "https://github.com/google/argh"
readme = "README.md"
[dependencies]
argh_shared = { version = "0.1.11", path = "../argh_shared" }
argh_derive = { version = "0.1.11", path = "../argh_derive" }
argh_shared = { version = "0.1.12", path = "../argh_shared" }
argh_derive = { version = "0.1.12", path = "../argh_derive" }
[dev-dependencies]
once_cell = "1.10.0"

42
argh/tests/lib.rs
View File

@ -81,6 +81,48 @@ fn custom_from_str_example() {
assert_eq!(f.five, 5);
}
#[test]
fn nested_from_str_example() {
#[derive(FromArgs)]
/// Goofy thing.
struct FiveStruct {
/// always five
#[argh(option, from_str_fn(nested::always_five))]
five: usize,
}
pub mod nested {
pub fn always_five(_value: &str) -> Result<usize, String> {
Ok(5)
}
}
let f = FiveStruct::from_args(&["cmdname"], &["--five", "woot"]).expect("failed to five");
assert_eq!(f.five, 5);
}
#[test]
fn method_from_str_example() {
#[derive(FromArgs)]
/// Goofy thing.
struct FiveStruct {
/// always five
#[argh(option, from_str_fn(AlwaysFive::<usize>::always_five))]
five: usize,
}
struct AlwaysFive<T>(T);
impl AlwaysFive<usize> {
fn always_five(_value: &str) -> Result<usize, String> {
Ok(5)
}
}
let f = FiveStruct::from_args(&["cmdname"], &["--five", "woot"]).expect("failed to five");
assert_eq!(f.five, 5);
}
#[test]
fn subcommand_example() {
#[derive(FromArgs, PartialEq, Debug)]

4
argh_derive/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "argh_derive"
version = "0.1.11"
version = "0.1.12"
authors = ["Taylor Cramer <cramertj@google.com>", "Benjamin Brittain <bwb@google.com>", "Erick Tryzelaar <etryzelaar@google.com>"]
edition = "2018"
license = "BSD-3-Clause"
@ -15,4 +15,4 @@ proc-macro = true
proc-macro2 = "1.0"
quote = "1.0"
syn = "2.0"
argh_shared = { version = "0.1.11", path = "../argh_shared" }
argh_shared = { version = "0.1.12", path = "../argh_shared" }

4
argh_derive/src/parse_attrs.rs
View File

@ -13,7 +13,7 @@ use {
pub struct FieldAttrs {
pub default: Option<syn::LitStr>,
pub description: Option<Description>,
pub from_str_fn: Option<syn::Ident>,
pub from_str_fn: Option<syn::ExprPath>,
pub field_type: Option<FieldType>,
pub long: Option<syn::LitStr>,
pub short: Option<syn::LitChar>,
@ -209,7 +209,7 @@ fn parse_attr_fn_name(
errors: &Errors,
m: &syn::MetaList,
attr_name: &str,
slot: &mut Option<syn::Ident>,
slot: &mut Option<syn::ExprPath>,
) {
if let Some(first) = slot {
errors.duplicate_attrs(attr_name, first, m);

2
argh_shared/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "argh_shared"
version = "0.1.11"
version = "0.1.12"
authors = ["Taylor Cramer <cramertj@google.com>", "Benjamin Brittain <bwb@google.com>", "Erick Tryzelaar <etryzelaar@google.com>"]
edition = "2018"
license = "BSD-3-Clause"