tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cli/completion: use match statements and .contains()

Browse Source 
`match` is a bit more readable than the if-else chains,
also replace
    space_chars.iter().any(|s| c == *s)
with
    space_chars.contains(&c)
which is also more readable.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-11-29 13:37:34 +01:00
parent e399398444
commit 8423c1fe64
1 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/cli/completion.rs
View File

@ -36,19 +36,21 @@ pub fn shellword_split_unclosed(s: &str, finalize: bool) -> (Vec<String>, Option
for (index, c) in char_indices {
match mode {
ParseMode::Space => {
if c == '"' {
ParseMode::Space => match c {
'"' => {
mode = ParseMode::DoubleQuote;
field_start = Some((index, Quote::Double));
} else if c == '\\' {
}
'\\' => {
mode = ParseMode::EscapeNormal;
field_start = Some((index, Quote::None));
} else if c == '\'' {
}
'\'' => {
mode = ParseMode::SingleQuote;
field_start = Some((index, Quote::Single));
} else if space_chars.iter().any(|s| c == *s) {
/* skip space */
} else {
}
c if space_chars.contains(&c) => (), // skip space
c => {
mode = ParseMode::Normal;
field_start = Some((index, Quote::None));
field.push(c);
@ -62,45 +64,33 @@ pub fn shellword_split_unclosed(s: &str, finalize: bool) -> (Vec<String>, Option
// Within double quoted strings, backslashes are only
// treated as metacharacters when followed by one of
// the following characters: $ ' " \ newline
if c == '$' || c == '\'' || c == '"' || c == '\\' || c == '\n' {
field.push(c);
} else {
field.push('\\');
field.push(c);
match c {
'$' | '\'' | '"' | '\\' | '\n' => (),
_ => field.push('\\'),
}
field.push(c);
mode = ParseMode::DoubleQuote;
}
ParseMode::Normal => {
if c == '"' {
mode = ParseMode::DoubleQuote;
} else if c == '\'' {
mode = ParseMode::SingleQuote;
} else if c == '\\' {
mode = ParseMode::EscapeNormal;
} else if space_chars.iter().any(|s| c == *s) {
ParseMode::Normal => match c {
'"' => mode = ParseMode::DoubleQuote,
'\'' => mode = ParseMode::SingleQuote,
'\\' => mode = ParseMode::EscapeNormal,
c if space_chars.contains(&c) => {
mode = ParseMode::Space;
let (_start, _quote) = field_start.take().unwrap();
args.push(field.split_off(0));
} else {
field.push(c); // continue
}
c => field.push(c), // continue
}
ParseMode::DoubleQuote => {
if c == '"' {
mode = ParseMode::Normal;
} else if c == '\\' {
mode = ParseMode::EscapeInDoubleQuote;
} else {
field.push(c); // continue
}
ParseMode::DoubleQuote => match c {
'"' => mode = ParseMode::Normal,
'\\' => mode = ParseMode::EscapeInDoubleQuote,
c => field.push(c), // continue
}
ParseMode::SingleQuote => {
ParseMode::SingleQuote => match c {
// Note: no escape in single quotes
if c == '\'' {
mode = ParseMode::Normal;
} else {
field.push(c); // continue
}
'\'' => mode = ParseMode::Normal,
c => field.push(c), // continue
}
}
}