diff --git a/option_parser/src/lib.rs b/option_parser/src/lib.rs index 7a3991242..e35e88ab4 100644 --- a/option_parser/src/lib.rs +++ b/option_parser/src/lib.rs @@ -38,7 +38,7 @@ impl fmt::Display for OptionParserError { } type OptionParserResult = std::result::Result; -fn split_commas_outside_brackets(s: &str) -> OptionParserResult> { +fn split_commas(s: &str) -> OptionParserResult> { let mut list: Vec = Vec::new(); let mut opened_brackets = 0; let mut current = String::new(); @@ -88,7 +88,7 @@ impl OptionParser { 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(); match self.options.get_mut(parts[0]) { @@ -303,9 +303,8 @@ impl FromStr for Tuple { fn from_str(s: &str) -> std::result::Result { let mut list: Vec<(S, T)> = Vec::new(); - let tuples_list = - split_commas_outside_brackets(s.trim().trim_matches(|c| c == '[' || c == ']')) - .map_err(TupleError::SplitOutsideBrackets)?; + let tuples_list = split_commas(s.trim().trim_matches(|c| c == '[' || c == ']')) + .map_err(TupleError::SplitOutsideBrackets)?; for tuple in tuples_list.iter() { let items: Vec<&str> = tuple.split('@').collect();