Parser::append

src/roxy.rs

@@ -6,18 +6,23 @@ use std::{
 
 use crate::error::Error;
 
-pub trait Parse {
+pub trait AsParse {
-    fn parse(&mut self, path: &str, src: &[u8], dst: &mut Vec<u8>) -> Result<(), Error>;
+    fn as_parse(&self) -> &dyn Parse;
+    fn as_parse_mut(&mut self) -> &mut dyn Parse;
 }
 
-impl<'a, P: Parse + 'static> Into<Box<dyn Parse>> for (P,) {
+impl<P: Parse> AsParse for P {
-    fn into(self) -> Box<dyn Parse> {
+    fn as_parse(&self) -> &dyn Parse {
-        Box::new(self.0)
+        self
+    }
+
+    fn as_parse_mut(&mut self) -> &mut dyn Parse {
+        self
     }
 }
 
-pub trait AndThenParser<P> {
+pub trait Parse: AsParse {
-    fn and_then(&mut self, parser: P) -> &Self;
+    fn parse(&mut self, path: &str, src: &[u8], dst: &mut Vec<u8>) -> Result<(), Error>;
 }
 
 pub struct Parser<'a> {
@@ -29,8 +34,12 @@ impl<'a> Parser<'a> {
         Parser { steps: Vec::new() }
     }
 
-    pub fn push<P: Into<&'a mut dyn Parse>>(&mut self, parser: P) {
+    pub fn push<P: AsParse>(&mut self, parser: &'a mut P) {
-        self.steps.push(parser.into());
+        self.steps.push(parser.as_parse_mut());
+    }
+
+    pub fn append(&mut self, parsers: &mut Vec<&'a mut dyn Parse>) {
+        self.steps.append(parsers);
     }
 }
 
@@ -136,3 +145,27 @@ impl Roxy {
         Self::mkdir_and_open(&output).and_then(|mut f| f.write_all(&buf))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::{Parse, Parser};
+
+    struct TestParser;
+    impl TestParser {
+        pub fn new() -> Self {
+            Self
+        }
+    }
+
+    impl Parse for TestParser {
+        fn parse(
+            &mut self,
+            path: &str,
+            src: &[u8],
+            dst: &mut Vec<u8>,
+        ) -> Result<(), crate::error::Error> {
+            Ok(())
+        }
+    }
+}
+