diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rust/protover/protoset.rs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/rust/protover/protoset.rs b/src/rust/protover/protoset.rs index 61b21ede98..027dfba203 100644 --- a/src/rust/protover/protoset.rs +++ b/src/rust/protover/protoset.rs @@ -340,11 +340,9 @@ impl FromStr for ProtoSet { /// ``` fn from_str(version_string: &str) -> Result<Self, Self::Err> { let mut pairs: Vec<(Version, Version)> = Vec::new(); - let pieces: ::std::str::Split<char> = version_string.trim().split(','); - - for piece in pieces { - let p: &str = piece.trim(); + let pieces: ::std::str::Split<char> = version_string.split(','); + for p in pieces { if p.is_empty() { continue; } else if p.contains('-') { @@ -369,7 +367,7 @@ impl FromStr for ProtoSet { pairs.push((v, v)); } } - // If we were passed in an empty string, or a bunch of whitespace, or + // If we were passed in an empty string, or // simply a comma, or a pile of commas, then return an empty ProtoSet. if pairs.len() == 0 { return Ok(ProtoSet::default()); @@ -561,6 +559,13 @@ mod test { } #[test] + fn test_versions_from_str_whitespace() { + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1,2\n")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1\r,2")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1,\t2")); + } + + #[test] fn test_versions_from_str_overlap() { assert_eq!(Err(ProtoverError::Overlap), ProtoSet::from_str("1-3,2-4")); } |