github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-06 19:45:29 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Merge pull request #15 from vrmiguel/oof-argparsing-shoft-arg-flags-fix

Browse Source 
Fixing short flags not receiving values
This commit is contained in:
Vinícius Miguel 2021-04-05 19:23:47 -03:00 committed by GitHub
commit 94ecc63886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
oof/src/lib.rs
View File

@ -126,7 +126,7 @@ pub fn filter_flags(
// For each letter in the short arg, except the last one // For each letter in the short arg, except the last one
for (i, letter) in letters.iter().copied().enumerate() { for (i, letter) in letters.iter().copied().enumerate() {
// Safety: this loop only runs when len >= 1 // Safety: this loop only runs when len >= 1, so this subtraction is safe
let is_last_letter = i == letters.len() - 1; let is_last_letter = i == letters.len() - 1;
let flag_info = short_flags_info.get(&letter).unwrap_or_else(|| { let flag_info = short_flags_info.get(&letter).unwrap_or_else(|| {
@ -149,16 +149,15 @@ pub fn filter_flags(
} }
// pop the next one // pop the next one
let flag_argument = iter.next(); let flag_argument = iter.next().unwrap_or_else(|| {
flag_argument.unwrap_or_else(|| {
panic!( panic!(
"USer errror: argument flag `argument_flag` came at last, but it \ "USer errror: argument flag `argument_flag` came at last, but it \
requires an argument" requires an argument"
) )
}); });
// Otherwise, insert it (TODO: grab next one and add it) // Otherwise, insert it.
// result_flags.argument_flags.insert(flag_info.long); result_flags.argument_flags.insert(flag_name, flag_argument);
} else { } else {
// If it was already inserted // If it was already inserted
if result_flags.boolean_flags.contains(flag_name) { if result_flags.boolean_flags.contains(flag_name) {

1
oof/src/util.rs
View File

@ -5,6 +5,7 @@ pub fn trim_double_hyphen(flag_text: &str) -> &str {
chars.as_str() chars.as_str()
} }
// Currently unused
/// Util function to skip the single leading short flag hyphen. /// Util function to skip the single leading short flag hyphen.
pub fn trim_single_hyphen(flag_text: &str) -> &str { pub fn trim_single_hyphen(flag_text: &str) -> &str {
let mut chars = flag_text.chars(); let mut chars = flag_text.chars();