Update after askama-rs#141 was merged

Author: Kijewski

fuzzing/fuzz/src/parser.rs

@@ -1,5 +1,5 @@
 use arbitrary::{Arbitrary, Unstructured};
-use rinja_parser::{Ast, Syntax};
+use rinja_parser::{Ast, Syntax, SyntaxBuilder};
 
 #[derive(Debug, Default)]
 pub struct Scenario<'a> {
@@ -13,10 +13,21 @@ impl<'a> super::Scenario<'a> for Scenario<'a> {
     fn new(data: &'a [u8]) -> Result<Self, arbitrary::Error> {
         let mut data = Unstructured::new(data);
 
-        let syntax = ArbitrarySyntax::arbitrary(&mut data)?;
-        let _syntax = syntax.as_syntax();
-        // FIXME: related issue: <https://github.com/rinja-rs/rinja/issues/138>
-        let syntax = Syntax::default();
+        let syntax = if let Some(syntax) = <Option<[Option<&'a str>; 6]>>::arbitrary(&mut data)? {
+            SyntaxBuilder {
+                name: "test",
+                block_start: syntax[0],
+                block_end: syntax[1],
+                expr_start: syntax[2],
+                expr_end: syntax[3],
+                comment_start: syntax[4],
+                comment_end: syntax[5],
+            }
+            .to_syntax()
+            .map_err(|_| arbitrary::Error::IncorrectFormat)?
+        } else {
+            Syntax::default()
+        };
 
         let src = <&str>::arbitrary_take_rest(data)?;
 
@@ -29,21 +40,3 @@ impl<'a> super::Scenario<'a> for Scenario<'a> {
         Ok(())
     }
 }
-
-#[derive(Arbitrary, Default)]
-struct ArbitrarySyntax<'a>(Option<[Option<&'a str>; 6]>);
-
-impl<'a> ArbitrarySyntax<'a> {
-    fn as_syntax(&self) -> Syntax<'a> {
-        let default = Syntax::default();
-        let values = self.0.unwrap_or_default();
-        Syntax {
-            block_start: values[0].unwrap_or(default.block_start),
-            block_end: values[1].unwrap_or(default.block_end),
-            expr_start: values[2].unwrap_or(default.expr_start),
-            expr_end: values[3].unwrap_or(default.expr_end),
-            comment_start: values[4].unwrap_or(default.comment_start),
-            comment_end: values[5].unwrap_or(default.comment_end),
-        }
-    }
-}