mirror of
https://github.com/clap-rs/clap
synced 2024-12-14 14:52:33 +00:00
Qualify all names in bodies of exported macros with $crate::
The lack of qualification caused odd errors such as:
```
use clap;
let foo = clap::value_t!(matches.value_of("foo"),i u32).unwrap(); # OK
lot bar = clap::value_t!(matches, "bar", u32).unwrap(); # Compile fail
```
but
```
use clap::value_t;
let foo = value_t!(matches.value_of("foo"),i u32).unwrap(); # OK
lot bar = value_t!(matches, "bar", u32).unwrap(); # OK
```
This commit is contained in:
Brian Foley
Kevin K
parent
c3b7c01f54
commit
56d182d98b
1 changed files with 67 additions and 67 deletions
134
src/macros.rs
134
src/macros.rs
|
|
@ -27,7 +27,7 @@
|
|||
#[macro_export]
|
||||
macro_rules! load_yaml {
|
||||
($yml:expr) => {
|
||||
&::clap::YamlLoader::load_from_str(include_str!($yml)).expect("failed to load YAML file")[0]
|
||||
&$crate::YamlLoader::load_from_str(include_str!($yml)).expect("failed to load YAML file")[0]
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -60,19 +60,19 @@ macro_rules! load_yaml {
|
|||
#[macro_export]
|
||||
macro_rules! value_t {
|
||||
($m:ident, $v:expr, $t:ty) => {
|
||||
value_t!($m.value_of($v), $t)
|
||||
$crate::value_t!($m.value_of($v), $t)
|
||||
};
|
||||
($m:ident.value_of($v:expr), $t:ty) => {
|
||||
if let Some(v) = $m.value_of($v) {
|
||||
match v.parse::<$t>() {
|
||||
Ok(val) => Ok(val),
|
||||
Err(_) => Err(::clap::Error::value_validation_auto(&format!(
|
||||
Err(_) => Err($crate::Error::value_validation_auto(&format!(
|
||||
"The argument '{}' isn't a valid value",
|
||||
v
|
||||
))),
|
||||
}
|
||||
} else {
|
||||
Err(::clap::Error::argument_not_found_auto($v))
|
||||
Err($crate::Error::argument_not_found_auto($v))
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -106,20 +106,20 @@ macro_rules! value_t {
|
|||
#[macro_export]
|
||||
macro_rules! value_t_or_exit {
|
||||
($m:ident, $v:expr, $t:ty) => {
|
||||
value_t_or_exit!($m.value_of($v), $t)
|
||||
$crate::value_t_or_exit!($m.value_of($v), $t)
|
||||
};
|
||||
($m:ident.value_of($v:expr), $t:ty) => {
|
||||
if let Some(v) = $m.value_of($v) {
|
||||
match v.parse::<$t>() {
|
||||
Ok(val) => val,
|
||||
Err(_) => ::clap::Error::value_validation_auto(&format!(
|
||||
Err(_) => $crate::Error::value_validation_auto(&format!(
|
||||
"The argument '{}' isn't a valid value",
|
||||
v
|
||||
))
|
||||
.exit(),
|
||||
}
|
||||
} else {
|
||||
::clap::Error::argument_not_found_auto($v).exit()
|
||||
$crate::Error::argument_not_found_auto($v).exit()
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -156,7 +156,7 @@ macro_rules! value_t_or_exit {
|
|||
#[macro_export]
|
||||
macro_rules! values_t {
|
||||
($m:ident, $v:expr, $t:ty) => {
|
||||
values_t!($m.values_of($v), $t)
|
||||
$crate::values_t!($m.values_of($v), $t)
|
||||
};
|
||||
($m:ident.values_of($v:expr), $t:ty) => {
|
||||
if let Some(vals) = $m.values_of($v) {
|
||||
|
|
@ -166,7 +166,7 @@ macro_rules! values_t {
|
|||
match pv.parse::<$t>() {
|
||||
Ok(rv) => tmp.push(rv),
|
||||
Err(..) => {
|
||||
err = Some(::clap::Error::value_validation_auto(&format!(
|
||||
err = Some($crate::Error::value_validation_auto(&format!(
|
||||
"The argument '{}' isn't a valid value",
|
||||
pv
|
||||
)));
|
||||
|
|
@ -179,7 +179,7 @@ macro_rules! values_t {
|
|||
None => Ok(tmp),
|
||||
}
|
||||
} else {
|
||||
Err(::clap::Error::argument_not_found_auto($v))
|
||||
Err($crate::Error::argument_not_found_auto($v))
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -219,13 +219,13 @@ macro_rules! values_t {
|
|||
#[macro_export]
|
||||
macro_rules! values_t_or_exit {
|
||||
($m:ident, $v:expr, $t:ty) => {
|
||||
values_t_or_exit!($m.values_of($v), $t)
|
||||
$crate::values_t_or_exit!($m.values_of($v), $t)
|
||||
};
|
||||
($m:ident.values_of($v:expr), $t:ty) => {
|
||||
if let Some(vals) = $m.values_of($v) {
|
||||
vals.map(|v| {
|
||||
v.parse::<$t>().unwrap_or_else(|_| {
|
||||
::clap::Error::value_validation_auto(&format!(
|
||||
$crate::Error::value_validation_auto(&format!(
|
||||
"One or more arguments aren't valid values"
|
||||
))
|
||||
.exit()
|
||||
|
|
@ -233,7 +233,7 @@ macro_rules! values_t_or_exit {
|
|||
})
|
||||
.collect::<Vec<$t>>()
|
||||
} else {
|
||||
::clap::Error::argument_not_found_auto($v).exit()
|
||||
$crate::Error::argument_not_found_auto($v).exit()
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -317,7 +317,7 @@ macro_rules! _clap_count_exprs {
|
|||
macro_rules! arg_enum {
|
||||
(@as_item $($i:item)*) => ($($i)*);
|
||||
(@impls ( $($tts:tt)* ) -> ($e:ident, $($v:ident),+)) => {
|
||||
arg_enum!(@as_item
|
||||
$crate::arg_enum!(@as_item
|
||||
$($tts)*
|
||||
|
||||
impl ::std::str::FromStr for $e {
|
||||
|
|
@ -354,7 +354,7 @@ macro_rules! arg_enum {
|
|||
});
|
||||
};
|
||||
($(#[$($m:meta),+])+ pub enum $e:ident { $($v:ident $(=$val:expr)*,)+ } ) => {
|
||||
arg_enum!(@impls
|
||||
$crate::arg_enum!(@impls
|
||||
($(#[$($m),+])+
|
||||
pub enum $e {
|
||||
$($v$(=$val)*),+
|
||||
|
|
@ -362,7 +362,7 @@ macro_rules! arg_enum {
|
|||
);
|
||||
};
|
||||
($(#[$($m:meta),+])+ pub enum $e:ident { $($v:ident $(=$val:expr)*),+ } ) => {
|
||||
arg_enum!(@impls
|
||||
$crate::arg_enum!(@impls
|
||||
($(#[$($m),+])+
|
||||
pub enum $e {
|
||||
$($v$(=$val)*),+
|
||||
|
|
@ -370,14 +370,14 @@ macro_rules! arg_enum {
|
|||
);
|
||||
};
|
||||
($(#[$($m:meta),+])+ enum $e:ident { $($v:ident $(=$val:expr)*,)+ } ) => {
|
||||
arg_enum!($(#[$($m:meta),+])+
|
||||
$crate::arg_enum!($(#[$($m:meta),+])+
|
||||
enum $e:ident {
|
||||
$($v:ident $(=$val:expr)*),+
|
||||
}
|
||||
);
|
||||
};
|
||||
($(#[$($m:meta),+])+ enum $e:ident { $($v:ident $(=$val:expr)*),+ } ) => {
|
||||
arg_enum!(@impls
|
||||
$crate::arg_enum!(@impls
|
||||
($(#[$($m),+])+
|
||||
enum $e {
|
||||
$($v$(=$val)*),+
|
||||
|
|
@ -385,24 +385,24 @@ macro_rules! arg_enum {
|
|||
);
|
||||
};
|
||||
(pub enum $e:ident { $($v:ident $(=$val:expr)*,)+ } ) => {
|
||||
arg_enum!(pub enum $e:ident {
|
||||
$crate::arg_enum!(pub enum $e:ident {
|
||||
$($v:ident $(=$val:expr)*),+
|
||||
});
|
||||
};
|
||||
(pub enum $e:ident { $($v:ident $(=$val:expr)*),+ } ) => {
|
||||
arg_enum!(@impls
|
||||
$crate::arg_enum!(@impls
|
||||
(pub enum $e {
|
||||
$($v$(=$val)*),+
|
||||
}) -> ($e, $($v),+)
|
||||
);
|
||||
};
|
||||
(enum $e:ident { $($v:ident $(=$val:expr)*,)+ } ) => {
|
||||
arg_enum!(enum $e:ident {
|
||||
$crate::arg_enum!(enum $e:ident {
|
||||
$($v:ident $(=$val:expr)*),+
|
||||
});
|
||||
};
|
||||
(enum $e:ident { $($v:ident $(=$val:expr)*),+ } ) => {
|
||||
arg_enum!(@impls
|
||||
$crate::arg_enum!(@impls
|
||||
(enum $e {
|
||||
$($v$(=$val)*),+
|
||||
}) -> ($e, $($v),+)
|
||||
|
|
@ -565,16 +565,16 @@ macro_rules! crate_name {
|
|||
#[macro_export]
|
||||
macro_rules! app_from_crate {
|
||||
() => {
|
||||
$crate::App::new(crate_name!())
|
||||
.version(crate_version!())
|
||||
.author(crate_authors!())
|
||||
.about(crate_description!())
|
||||
$crate::App::new($crate::crate_name!())
|
||||
.version($crate::crate_version!())
|
||||
.author($crate::crate_authors!())
|
||||
.about($crate::crate_description!())
|
||||
};
|
||||
($sep:expr) => {
|
||||
$crate::App::new(crate_name!())
|
||||
.version(crate_version!())
|
||||
.author(crate_authors!($sep))
|
||||
.about(crate_description!())
|
||||
$crate::App::new($crate::crate_name!())
|
||||
.version($crate::crate_version!())
|
||||
.author($crate::crate_authors!($sep))
|
||||
.about($crate::crate_description!())
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -656,52 +656,52 @@ macro_rules! app_from_crate {
|
|||
macro_rules! clap_app {
|
||||
(@app ($builder:expr)) => { $builder };
|
||||
(@app ($builder:expr) (@arg ($name:expr): $($tail:tt)*) $($tt:tt)*) => {
|
||||
clap_app!{ @app
|
||||
$crate::clap_app!{ @app
|
||||
($builder.arg(
|
||||
clap_app!{ @arg ($crate::Arg::with_name($name)) (-) $($tail)* }))
|
||||
$crate::clap_app!{ @arg ($crate::Arg::with_name($name)) (-) $($tail)* }))
|
||||
$($tt)*
|
||||
}
|
||||
};
|
||||
(@app ($builder:expr) (@arg $name:ident: $($tail:tt)*) $($tt:tt)*) => {
|
||||
clap_app!{ @app
|
||||
$crate::clap_app!{ @app
|
||||
($builder.arg(
|
||||
clap_app!{ @arg ($crate::Arg::with_name(stringify!($name))) (-) $($tail)* }))
|
||||
$crate::clap_app!{ @arg ($crate::Arg::with_name(stringify!($name))) (-) $($tail)* }))
|
||||
$($tt)*
|
||||
}
|
||||
};
|
||||
(@app ($builder:expr) (@setting $setting:ident) $($tt:tt)*) => {
|
||||
clap_app!{ @app
|
||||
$crate::clap_app!{ @app
|
||||
($builder.setting($crate::AppSettings::$setting))
|
||||
$($tt)*
|
||||
}
|
||||
};
|
||||
// Treat the application builder as an argument to set its attributes
|
||||
(@app ($builder:expr) (@attributes $($attr:tt)*) $($tt:tt)*) => {
|
||||
clap_app!{ @app (clap_app!{ @arg ($builder) $($attr)* }) $($tt)* }
|
||||
$crate::clap_app!{ @app ($crate::clap_app!{ @arg ($builder) $($attr)* }) $($tt)* }
|
||||
};
|
||||
(@app ($builder:expr) (@group $name:ident => $($tail:tt)*) $($tt:tt)*) => {
|
||||
clap_app!{ @app
|
||||
(clap_app!{ @group ($builder, $crate::ArgGroup::with_name(stringify!($name))) $($tail)* })
|
||||
$crate::clap_app!{ @app
|
||||
($crate::clap_app!{ @group ($builder, $crate::ArgGroup::with_name(stringify!($name))) $($tail)* })
|
||||
$($tt)*
|
||||
}
|
||||
};
|
||||
(@app ($builder:expr) (@group $name:ident !$ident:ident => $($tail:tt)*) $($tt:tt)*) => {
|
||||
clap_app!{ @app
|
||||
(clap_app!{ @group ($builder, $crate::ArgGroup::with_name(stringify!($name)).$ident(false)) $($tail)* })
|
||||
$crate::clap_app!{ @app
|
||||
($crate::clap_app!{ @group ($builder, $crate::ArgGroup::with_name(stringify!($name)).$ident(false)) $($tail)* })
|
||||
$($tt)*
|
||||
}
|
||||
};
|
||||
(@app ($builder:expr) (@group $name:ident +$ident:ident => $($tail:tt)*) $($tt:tt)*) => {
|
||||
clap_app!{ @app
|
||||
(clap_app!{ @group ($builder, $crate::ArgGroup::with_name(stringify!($name)).$ident(true)) $($tail)* })
|
||||
$crate::clap_app!{ @app
|
||||
($crate::clap_app!{ @group ($builder, $crate::ArgGroup::with_name(stringify!($name)).$ident(true)) $($tail)* })
|
||||
$($tt)*
|
||||
}
|
||||
};
|
||||
// Handle subcommand creation
|
||||
(@app ($builder:expr) (@subcommand $name:ident => $($tail:tt)*) $($tt:tt)*) => {
|
||||
clap_app!{ @app
|
||||
$crate::clap_app!{ @app
|
||||
($builder.subcommand(
|
||||
clap_app!{ @app ($crate::App::new(stringify!($name))) $($tail)* }
|
||||
$crate::clap_app!{ @app ($crate::App::new(stringify!($name))) $($tail)* }
|
||||
))
|
||||
$($tt)*
|
||||
}
|
||||
|
|
@ -709,7 +709,7 @@ macro_rules! clap_app {
|
|||
// Yaml like function calls - used for setting various meta directly against the app
|
||||
(@app ($builder:expr) ($ident:ident: $($v:expr),*) $($tt:tt)*) => {
|
||||
// clap_app!{ @app ($builder.$ident($($v),*)) $($tt)* }
|
||||
clap_app!{ @app
|
||||
$crate::clap_app!{ @app
|
||||
($builder.$ident($($v),*))
|
||||
$($tt)*
|
||||
}
|
||||
|
|
@ -719,11 +719,11 @@ macro_rules! clap_app {
|
|||
(@group ($builder:expr, $group:expr)) => { $builder.group($group) };
|
||||
// Treat the group builder as an argument to set its attributes
|
||||
(@group ($builder:expr, $group:expr) (@attributes $($attr:tt)*) $($tt:tt)*) => {
|
||||
clap_app!{ @group ($builder, clap_app!{ @arg ($group) (-) $($attr)* }) $($tt)* }
|
||||
$crate::clap_app!{ @group ($builder, $crate::clap_app!{ @arg ($group) (-) $($attr)* }) $($tt)* }
|
||||
};
|
||||
(@group ($builder:expr, $group:expr) (@arg $name:ident: $($tail:tt)*) $($tt:tt)*) => {
|
||||
clap_app!{ @group
|
||||
(clap_app!{ @app ($builder) (@arg $name: $($tail)*) },
|
||||
$crate::clap_app!{ @group
|
||||
($crate::clap_app!{ @app ($builder) (@arg $name: $($tail)*) },
|
||||
$group.arg(stringify!($name)))
|
||||
$($tt)*
|
||||
}
|
||||
|
|
@ -733,71 +733,71 @@ macro_rules! clap_app {
|
|||
(@arg ($arg:expr) $modes:tt) => { $arg };
|
||||
// Shorthand tokens influenced by the usage_string
|
||||
(@arg ($arg:expr) $modes:tt --($long:expr) $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.long($long)) $modes $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.long($long)) $modes $($tail)* }
|
||||
};
|
||||
(@arg ($arg:expr) $modes:tt --$long:ident $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.long(stringify!($long))) $modes $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.long(stringify!($long))) $modes $($tail)* }
|
||||
};
|
||||
(@arg ($arg:expr) $modes:tt -$short:ident $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.short(stringify!($short).chars().nth(0).unwrap())) $modes $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.short(stringify!($short).chars().nth(0).unwrap())) $modes $($tail)* }
|
||||
};
|
||||
(@arg ($arg:expr) (-) <$var:ident> $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.value_name(stringify!($var))) (+) +takes_value +required $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.value_name(stringify!($var))) (+) +takes_value +required $($tail)* }
|
||||
};
|
||||
(@arg ($arg:expr) (+) <$var:ident> $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.value_name(stringify!($var))) (+) $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.value_name(stringify!($var))) (+) $($tail)* }
|
||||
};
|
||||
(@arg ($arg:expr) (-) [$var:ident] $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.value_name(stringify!($var))) (+) +takes_value $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.value_name(stringify!($var))) (+) +takes_value $($tail)* }
|
||||
};
|
||||
(@arg ($arg:expr) (+) [$var:ident] $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.value_name(stringify!($var))) (+) $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.value_name(stringify!($var))) (+) $($tail)* }
|
||||
};
|
||||
(@arg ($arg:expr) $modes:tt ... $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg) $modes +multiple $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg) $modes +multiple $($tail)* }
|
||||
};
|
||||
// Shorthand magic
|
||||
(@arg ($arg:expr) $modes:tt #{$n:expr, $m:expr} $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg) $modes min_values($n) max_values($m) $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg) $modes min_values($n) max_values($m) $($tail)* }
|
||||
};
|
||||
(@arg ($arg:expr) $modes:tt * $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg) $modes +required $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg) $modes +required $($tail)* }
|
||||
};
|
||||
// !foo -> .foo(false)
|
||||
(@arg ($arg:expr) $modes:tt !$ident:ident $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.$ident(false)) $modes $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.$ident(false)) $modes $($tail)* }
|
||||
};
|
||||
// +foo -> .foo(true)
|
||||
(@arg ($arg:expr) $modes:tt +$ident:ident $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.$ident(true)) $modes $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.$ident(true)) $modes $($tail)* }
|
||||
};
|
||||
// Validator
|
||||
(@arg ($arg:expr) $modes:tt {$fn_:expr} $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.validator($fn_)) $modes $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.validator($fn_)) $modes $($tail)* }
|
||||
};
|
||||
(@as_expr $expr:expr) => { $expr };
|
||||
// Help
|
||||
(@arg ($arg:expr) $modes:tt $desc:tt) => { $arg.help(clap_app!{ @as_expr $desc }) };
|
||||
// Handle functions that need to be called multiple times for each argument
|
||||
(@arg ($arg:expr) $modes:tt $ident:ident[$($target:ident)*] $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg $( .$ident(stringify!($target)) )*) $modes $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg $( .$ident(stringify!($target)) )*) $modes $($tail)* }
|
||||
};
|
||||
// Inherit builder's functions
|
||||
(@arg ($arg:expr) $modes:tt $ident:ident($($expr:expr)*) $($tail:tt)*) => {
|
||||
clap_app!{ @arg ($arg.$ident($($expr)*)) $modes $($tail)* }
|
||||
$crate::clap_app!{ @arg ($arg.$ident($($expr)*)) $modes $($tail)* }
|
||||
};
|
||||
|
||||
// Build a subcommand outside of an app.
|
||||
(@subcommand $name:ident => $($tail:tt)*) => {
|
||||
clap_app!{ @app ($crate::App::new(stringify!($name))) $($tail)* }
|
||||
$crate::clap_app!{ @app ($crate::App::new(stringify!($name))) $($tail)* }
|
||||
};
|
||||
// Start the magic
|
||||
(($name:expr) => $($tail:tt)*) => {{
|
||||
clap_app!{ @app ($crate::App::new($name)) $($tail)*}
|
||||
$crate::clap_app!{ @app ($crate::App::new($name)) $($tail)*}
|
||||
}};
|
||||
|
||||
($name:ident => $($tail:tt)*) => {{
|
||||
clap_app!{ @app ($crate::App::new(stringify!($name))) $($tail)*}
|
||||
$crate::clap_app!{ @app ($crate::App::new(stringify!($name))) $($tail)*}
|
||||
}};
|
||||
}
|
||||
|
||||
|
|
@ -901,7 +901,7 @@ macro_rules! flags {
|
|||
#[allow(unused_macros)]
|
||||
macro_rules! flags_mut {
|
||||
($app:expr) => {
|
||||
flags!($app, iter_mut)
|
||||
$crate::flags!($app, iter_mut)
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue