summaryrefslogtreecommitdiffstats
path: root/vendor/clap_derive/src
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/clap_derive/src')
-rw-r--r--vendor/clap_derive/src/derives/subcommand.rs14
-rw-r--r--vendor/clap_derive/src/item.rs72
2 files changed, 39 insertions, 47 deletions
diff --git a/vendor/clap_derive/src/derives/subcommand.rs b/vendor/clap_derive/src/derives/subcommand.rs
index 3ae74d01a..125a40f61 100644
--- a/vendor/clap_derive/src/derives/subcommand.rs
+++ b/vendor/clap_derive/src/derives/subcommand.rs
@@ -182,7 +182,7 @@ fn gen_augment(
Kind::Flatten(_) => match variant.fields {
Unnamed(FieldsUnnamed { ref unnamed, .. }) if unnamed.len() == 1 => {
- let ty = &unnamed[0];
+ let ty = &unnamed[0].ty;
let deprecations = if !override_required {
item.deprecations()
} else {
@@ -223,7 +223,7 @@ fn gen_augment(
}
Unit => quote!( #subcommand_var ),
Unnamed(FieldsUnnamed { ref unnamed, .. }) if unnamed.len() == 1 => {
- let ty = &unnamed[0];
+ let ty = &unnamed[0].ty;
if override_required {
quote_spanned! { ty.span()=>
{
@@ -293,7 +293,7 @@ fn gen_augment(
}
}
Unnamed(FieldsUnnamed { ref unnamed, .. }) if unnamed.len() == 1 => {
- let ty = &unnamed[0];
+ let ty = &unnamed[0].ty;
let arg_block = if override_required {
quote_spanned! { ty.span()=>
{
@@ -390,7 +390,7 @@ fn gen_has_subcommand(variants: &[(&Variant, Item)]) -> Result<TokenStream, syn:
.iter()
.map(|(variant, _attrs)| match variant.fields {
Unnamed(ref fields) if fields.unnamed.len() == 1 => {
- let ty = &fields.unnamed[0];
+ let ty = &fields.unnamed[0].ty;
Ok(quote! {
if <#ty as clap::Subcommand>::has_subcommand(__clap_name) {
return true;
@@ -496,7 +496,7 @@ fn gen_from_arg_matches(variants: &[(&Variant, Item)]) -> Result<TokenStream, sy
},
Unit => quote!(),
Unnamed(ref fields) if fields.unnamed.len() == 1 => {
- let ty = &fields.unnamed[0];
+ let ty = &fields.unnamed[0].ty;
quote!( ( <#ty as clap::FromArgMatches>::from_arg_matches_mut(__clap_arg_matches)? ) )
}
Unnamed(..) => abort_call_site!("{}: tuple enums are not supported", variant.ident),
@@ -512,7 +512,7 @@ fn gen_from_arg_matches(variants: &[(&Variant, Item)]) -> Result<TokenStream, sy
let variant_name = &variant.ident;
match variant.fields {
Unnamed(ref fields) if fields.unnamed.len() == 1 => {
- let ty = &fields.unnamed[0];
+ let ty = &fields.unnamed[0].ty;
Ok(quote! {
if __clap_arg_matches
.subcommand_name()
@@ -632,7 +632,7 @@ fn gen_update_from_arg_matches(variants: &[(&Variant, Item)]) -> Result<TokenStr
let variant_name = &variant.ident;
match variant.fields {
Unnamed(ref fields) if fields.unnamed.len() == 1 => {
- let ty = &fields.unnamed[0];
+ let ty = &fields.unnamed[0].ty;
Ok(quote! {
if <#ty as clap::Subcommand>::has_subcommand(__clap_name) {
if let Self :: #variant_name (child) = s {
diff --git a/vendor/clap_derive/src/item.rs b/vendor/clap_derive/src/item.rs
index f3631fa7f..114849f69 100644
--- a/vendor/clap_derive/src/item.rs
+++ b/vendor/clap_derive/src/item.rs
@@ -575,20 +575,22 @@ impl Item {
.any(|a| a.magic == Some(MagicAttrName::ValueEnum))
{
quote_spanned!(attr.name.clone().span()=> {
- static DEFAULT_VALUE: clap::__derive_refs::once_cell::sync::Lazy<String> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
+ static DEFAULT_VALUE: ::std::sync::OnceLock<String> = ::std::sync::OnceLock::new();
+ let s = DEFAULT_VALUE.get_or_init(|| {
let val: #ty = #val;
clap::ValueEnum::to_possible_value(&val).unwrap().get_name().to_owned()
});
- let s: &'static str = &*DEFAULT_VALUE;
+ let s: &'static str = &*s;
s
})
} else {
quote_spanned!(attr.name.clone().span()=> {
- static DEFAULT_VALUE: clap::__derive_refs::once_cell::sync::Lazy<String> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
+ static DEFAULT_VALUE: ::std::sync::OnceLock<String> = ::std::sync::OnceLock::new();
+ let s = DEFAULT_VALUE.get_or_init(|| {
let val: #ty = #val;
::std::string::ToString::to_string(&val)
});
- let s: &'static str = &*DEFAULT_VALUE;
+ let s: &'static str = &*s;
s
})
};
@@ -643,14 +645,11 @@ impl Item {
})
}
- static DEFAULT_STRINGS: clap::__derive_refs::once_cell::sync::Lazy<Vec<::std::string::String>> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
- iter_to_vals(#expr).collect()
- });
-
- static DEFAULT_VALUES: clap::__derive_refs::once_cell::sync::Lazy<Vec<&str>> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
- DEFAULT_STRINGS.iter().map(::std::string::String::as_str).collect()
- });
- DEFAULT_VALUES.iter().copied()
+ static DEFAULT_STRINGS: ::std::sync::OnceLock<Vec<String>> = ::std::sync::OnceLock::new();
+ static DEFAULT_VALUES: ::std::sync::OnceLock<Vec<&str>> = ::std::sync::OnceLock::new();
+ DEFAULT_VALUES.get_or_init(|| {
+ DEFAULT_STRINGS.get_or_init(|| iter_to_vals(#expr).collect()).iter().map(::std::string::String::as_str).collect()
+ }).iter().copied()
}
})
} else {
@@ -663,14 +662,11 @@ impl Item {
iterable.into_iter().map(|val| val.borrow().to_string())
}
- static DEFAULT_STRINGS: clap::__derive_refs::once_cell::sync::Lazy<Vec<::std::string::String>> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
- iter_to_vals(#expr).collect()
- });
-
- static DEFAULT_VALUES: clap::__derive_refs::once_cell::sync::Lazy<Vec<&str>> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
- DEFAULT_STRINGS.iter().map(::std::string::String::as_str).collect()
- });
- DEFAULT_VALUES.iter().copied()
+ static DEFAULT_STRINGS: ::std::sync::OnceLock<Vec<String>> = ::std::sync::OnceLock::new();
+ static DEFAULT_VALUES: ::std::sync::OnceLock<Vec<&str>> = ::std::sync::OnceLock::new();
+ DEFAULT_VALUES.get_or_init(|| {
+ DEFAULT_STRINGS.get_or_init(|| iter_to_vals(#expr).collect()).iter().map(::std::string::String::as_str).collect()
+ }).iter().copied()
}
})
};
@@ -707,20 +703,22 @@ impl Item {
.any(|a| a.magic == Some(MagicAttrName::ValueEnum))
{
quote_spanned!(attr.name.clone().span()=> {
- static DEFAULT_VALUE: clap::__derive_refs::once_cell::sync::Lazy<::std::ffi::OsString> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
+ static DEFAULT_VALUE: ::std::sync::OnceLock<String> = ::std::sync::OnceLock::new();
+ let s = DEFAULT_VALUE.get_or_init(|| {
let val: #ty = #val;
clap::ValueEnum::to_possible_value(&val).unwrap().get_name().to_owned()
});
- let s: &'static ::std::ffi::OsStr = &*DEFAULT_VALUE;
+ let s: &'static str = &*s;
s
})
} else {
quote_spanned!(attr.name.clone().span()=> {
- static DEFAULT_VALUE: clap::__derive_refs::once_cell::sync::Lazy<::std::ffi::OsString> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
+ static DEFAULT_VALUE: ::std::sync::OnceLock<::std::ffi::OsString> = ::std::sync::OnceLock::new();
+ let s = DEFAULT_VALUE.get_or_init(|| {
let val: #ty = #val;
::std::ffi::OsString::from(val)
});
- let s: &'static ::std::ffi::OsStr = &*DEFAULT_VALUE;
+ let s: &'static ::std::ffi::OsStr = &*s;
s
})
};
@@ -775,14 +773,11 @@ impl Item {
})
}
- static DEFAULT_OS_STRINGS: clap::__derive_refs::once_cell::sync::Lazy<Vec<::std::ffi::OsString>> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
- iter_to_vals(#expr).collect()
- });
-
- static DEFAULT_VALUES: clap::__derive_refs::once_cell::sync::Lazy<Vec<&::std::ffi::OsStr>> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
- DEFAULT_OS_STRINGS.iter().map(::std::ffi::OsString::as_os_str).collect()
- });
- DEFAULT_VALUES.iter().copied()
+ static DEFAULT_STRINGS: ::std::sync::OnceLock<Vec<::std::ffi::OsString>> = ::std::sync::OnceLock::new();
+ static DEFAULT_VALUES: ::std::sync::OnceLock<Vec<&::std::ffi::OsStr>> = ::std::sync::OnceLock::new();
+ DEFAULT_VALUES.get_or_init(|| {
+ DEFAULT_STRINGS.get_or_init(|| iter_to_vals(#expr).collect()).iter().map(::std::ffi::OsString::as_os_str).collect()
+ }).iter().copied()
}
})
} else {
@@ -795,14 +790,11 @@ impl Item {
iterable.into_iter().map(|val| val.borrow().into())
}
- static DEFAULT_OS_STRINGS: clap::__derive_refs::once_cell::sync::Lazy<Vec<::std::ffi::OsString>> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
- iter_to_vals(#expr).collect()
- });
-
- static DEFAULT_VALUES: clap::__derive_refs::once_cell::sync::Lazy<Vec<&::std::ffi::OsStr>> = clap::__derive_refs::once_cell::sync::Lazy::new(|| {
- DEFAULT_OS_STRINGS.iter().map(::std::ffi::OsString::as_os_str).collect()
- });
- DEFAULT_VALUES.iter().copied()
+ static DEFAULT_STRINGS: ::std::sync::OnceLock<Vec<::std::ffi::OsString>> = ::std::sync::OnceLock::new();
+ static DEFAULT_VALUES: ::std::sync::OnceLock<Vec<&::std::ffi::OsStr>> = ::std::sync::OnceLock::new();
+ DEFAULT_VALUES.get_or_init(|| {
+ DEFAULT_STRINGS.get_or_init(|| iter_to_vals(#expr).collect()).iter().map(::std::ffi::OsString::as_os_str).collect()
+ }).iter().copied()
}
})
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-24 21:24:45 +0000