Change Optional to vec

Author: loewenheim

relay-pattern/src/lib.rs

@@ -734,7 +734,7 @@ enum Token {
     },
     /// A list of nested alternate tokens `{a,b}`.
     Alternates(Vec<Tokens>),
-    Optional(Box<Token>),
+    Optional(Vec<Token>),
 }
 
 /// A string literal.

relay-pattern/src/wildmatch.rs

@@ -110,7 +110,7 @@ where
                     false
                 }
                 Token::Optional(optional) => {
-                    let optional = tokens.with_alternate(t_next, std::slice::from_ref(optional));
+                    let optional = tokens.with_alternate(t_next, &optional[..]);
                     if is_match_impl::<_, M>(h_current, &optional) {
                         // There is a match with the optional token, we're done.
                         return true;
@@ -625,7 +625,7 @@ mod tests {
     fn test_optional() {
         let mut tokens = Tokens::default();
 
-        tokens.push(Token::Optional(Box::new(Token::Literal(literal("foo")))));
+        tokens.push(Token::Optional(vec![Token::Literal(literal("foo"))]));
         assert!(is_match("foo", &tokens, Default::default()));
         assert!(is_match("", &tokens, Default::default()));
     }
@@ -646,7 +646,7 @@ mod tests {
             },
         ]);
 
-        tokens.push(Token::Optional(Box::new(alternates)));
+        tokens.push(Token::Optional(vec![alternates]));
         assert!(is_match("foo", &tokens, Default::default()));
         assert!(is_match("bar", &tokens, Default::default()));
         assert!(is_match("", &tokens, Default::default()));