Skip to content

Commit fa3a2f8

Browse files
committed
imp(From Usage): vastly improves the usage parser
Closes #350
1 parent d616d06 commit fa3a2f8

13 files changed

+391
-422
lines changed

src/app/parser.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl<'a, 'b> Parser<'a, 'b> where 'a: 'b {
143143
self.set(AppSettings::NeedsLongVersion);
144144
}
145145
}
146-
if a.required {
146+
if a.is_set(ArgSettings::Required) {
147147
self.required.push(a.name);
148148
}
149149
if a.index.is_some() || (a.short.is_none() && a.long.is_none()) {
@@ -160,15 +160,15 @@ impl<'a, 'b> Parser<'a, 'b> where 'a: 'b {
160160
}
161161
let pb = PosBuilder::from_arg(&a, i as u8, &mut self.required);
162162
self.positionals.insert(i, pb);
163-
} else if a.takes_value {
163+
} else if a.is_set(ArgSettings::TakesValue) {
164164
let ob = OptBuilder::from_arg(&a, &mut self.required);
165165
self.opts.push(ob);
166166
} else {
167167
let fb = FlagBuilder::from(a);
168168
self.flags.push(fb);
169169
}
170-
if a.global {
171-
if a.required {
170+
if a.is_set(ArgSettings::Global) {
171+
if a.is_set(ArgSettings::Required) {
172172
panic!("Global arguments cannot be required.\n\n\t'{}' is marked as global and \
173173
required",
174174
a.name);

0 commit comments

Comments
 (0)