[librsvg: 3/5] Remove support for NumberList::Unbounded




commit 7c59374baca2e572fc2661ce1cad0d7d4f96727a
Author: madds-h <madeline hollandart io>
Date:   Sun Apr 25 18:10:24 2021 -0500

    Remove support for NumberList::Unbounded

 src/parsers.rs | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)
---
diff --git a/src/parsers.rs b/src/parsers.rs
index 44a70933..f2c5a06a 100644
--- a/src/parsers.rs
+++ b/src/parsers.rs
@@ -135,7 +135,6 @@ impl Parse for u32 {
 pub enum NumberListLength {
     MaxLength(usize),
     Exact(usize),
-    Unbounded,
 }
 
 #[derive(Debug, PartialEq)]
@@ -155,13 +154,8 @@ impl NumberList {
             }
             NumberListLength::Exact(l) if l > 0 => Vec::<f64>::with_capacity(l),
             NumberListLength::Exact(_) => unreachable!("NumberListLength::Exact cannot be 0"),
-            NumberListLength::Unbounded => Vec::<f64>::new(),
         };
 
-        if parser.is_exhausted() && length == NumberListLength::Unbounded {
-            return Ok(NumberList(v));
-        }
-
         for i in 0.. {
             if i != 0 {
                 optional_comma(parser);
@@ -388,22 +382,13 @@ mod tests {
             NumberList::parse_str("1 2 3 4", NumberListLength::Exact(4)).unwrap(),
             NumberList(vec![1.0, 2.0, 3.0, 4.0])
         );
-
-        assert_eq!(
-            NumberList::parse_str("", NumberListLength::Unbounded).unwrap(),
-            NumberList(vec![])
-        );
-
-        assert_eq!(
-            NumberList::parse_str("1, 2, 3.0, 4, 5", NumberListLength::Unbounded).unwrap(),
-            NumberList(vec![1.0, 2.0, 3.0, 4.0, 5.0])
-        );
     }
 
     #[test]
     fn errors_on_invalid_number_list() {
         // empty
         assert!(NumberList::parse_str("", NumberListLength::Exact(1)).is_err());
+        assert!(NumberList::parse_str("", NumberListLength::MaxLength(1)).is_err());
 
         // garbage
         assert!(NumberList::parse_str("foo", NumberListLength::Exact(1)).is_err());
@@ -418,7 +403,6 @@ mod tests {
         // extra token
         assert!(NumberList::parse_str("1,", NumberListLength::Exact(1)).is_err());
         assert!(NumberList::parse_str("1,", NumberListLength::Exact(1)).is_err());
-        assert!(NumberList::parse_str("1,", NumberListLength::Unbounded).is_err());
 
         // too few
         assert!(NumberList::parse_str("1", NumberListLength::Exact(2)).is_err());


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]