External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

option_parser: Rename split_commas_outside_brackets to split_commas

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-08-08 13:50:59 +01:00
parent 46b790b582
commit 531621474f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
option_parser/src/lib.rs
View File

@ -38,7 +38,7 @@ impl fmt::Display for OptionParserError {
} }
type OptionParserResult<T> = std::result::Result<T, OptionParserError>; type OptionParserResult<T> = std::result::Result<T, OptionParserError>;
fn split_commas_outside_brackets(s: &str) -> OptionParserResult<Vec<String>> { fn split_commas(s: &str) -> OptionParserResult<Vec<String>> {
let mut list: Vec<String> = Vec::new(); let mut list: Vec<String> = Vec::new();
let mut opened_brackets = 0; let mut opened_brackets = 0;
let mut current = String::new(); let mut current = String::new();
@ -88,7 +88,7 @@ impl OptionParser {
return Ok(()); return Ok(());
} }
for option in split_commas_outside_brackets(input)?.iter() { for option in split_commas(input)?.iter() {
let parts: Vec<&str> = option.splitn(2, '=').collect(); let parts: Vec<&str> = option.splitn(2, '=').collect();
match self.options.get_mut(parts[0]) { match self.options.get_mut(parts[0]) {
@ -303,9 +303,8 @@ impl<S: FromStr, T: TupleValue> FromStr for Tuple<S, T> {
fn from_str(s: &str) -> std::result::Result<Self, Self::Err> { fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
let mut list: Vec<(S, T)> = Vec::new(); let mut list: Vec<(S, T)> = Vec::new();
let tuples_list = let tuples_list = split_commas(s.trim().trim_matches(|c| c == '[' || c == ']'))
split_commas_outside_brackets(s.trim().trim_matches(|c| c == '[' || c == ']')) .map_err(TupleError::SplitOutsideBrackets)?;
.map_err(TupleError::SplitOutsideBrackets)?;
for tuple in tuples_list.iter() { for tuple in tuples_list.iter() {
let items: Vec<&str> = tuple.split('@').collect(); let items: Vec<&str> = tuple.split('@').collect();