feat: 🎸 add life time (#87)

IWANABETHATGUY · web-flow · commit 40f595438214 · 2021-11-21T23:51:26.000+08:00
diff --git a/crates/recursive-parser/examples/plugin.rs b/crates/recursive-parser/examples/plugin.rs
@@ -36,8 +36,8 @@ impl<W: Write> SimplePrettier<W> {
     Self { level: 0, writer }
   }
 }
-impl<W: std::io::Write> VisitMut<std::io::Result<()>> for SimplePrettier<W> {
-  fn visit_root(&mut self, root: &mut Root) -> std::io::Result<()> {
+impl<'a, W: std::io::Write> VisitMut<'a, std::io::Result<()>> for SimplePrettier<W> {
+  fn visit_root(&mut self, root: &mut Root<'a>) -> std::io::Result<()> {
     for child in root.children.iter_mut() {
       match child {
         RuleOrAtRuleOrDecl::Rule(rule) => {
@@ -54,7 +54,7 @@ impl<W: std::io::Write> VisitMut<std::io::Result<()>> for SimplePrettier<W> {
     Ok(())
   }
 
-  fn visit_rule(&mut self, rule: &mut Rule) -> std::io::Result<()> {
+  fn visit_rule(&mut self, rule: &mut Rule<'a>) -> std::io::Result<()> {
     self.writer.write(
       format!(
         "{}{} {}\n",
@@ -83,7 +83,7 @@ impl<W: std::io::Write> VisitMut<std::io::Result<()>> for SimplePrettier<W> {
     Ok(())
   }
 
-  fn visit_at_rule(&mut self, at_rule: &mut AtRule) -> std::io::Result<()> {
+  fn visit_at_rule(&mut self, at_rule: &mut AtRule<'a>) -> std::io::Result<()> {
     write!(
       self.writer,
       "{}{} {} {}\n",
@@ -110,7 +110,7 @@ impl<W: std::io::Write> VisitMut<std::io::Result<()>> for SimplePrettier<W> {
     write!(self.writer, "{}{}\n", " ".repeat(self.level * 2), "}")
   }
 
-  fn visit_declaration(&mut self, decl: &mut Declaration) -> std::io::Result<()> {
+  fn visit_declaration(&mut self, decl: &mut Declaration<'a>) -> std::io::Result<()> {
     write!(
       self.writer,
       "{}{} : {};",
@@ -124,8 +124,8 @@ impl<W: std::io::Write> VisitMut<std::io::Result<()>> for SimplePrettier<W> {
 #[derive(Default)]
 struct ReverseProp {}
 
-impl VisitMut for ReverseProp {
-  fn visit_root(&mut self, root: &mut Root) {
+impl<'a> VisitMut<'a> for ReverseProp {
+  fn visit_root(&mut self, root: &mut Root<'a>) {
     root.children.iter_mut().for_each(|child| match child {
       RuleOrAtRuleOrDecl::Rule(rule) => {
         self.visit_rule(rule);
@@ -139,7 +139,7 @@ impl VisitMut for ReverseProp {
     });
   }
 
-  fn visit_rule(&mut self, rule: &mut Rule) {
+  fn visit_rule(&mut self, rule: &mut Rule<'a>) {
     rule
       .children
       .iter_mut()
@@ -156,7 +156,7 @@ impl VisitMut for ReverseProp {
       });
   }
 
-  fn visit_at_rule(&mut self, at_rule: &mut AtRule) {
+  fn visit_at_rule(&mut self, at_rule: &mut AtRule<'a>) {
     at_rule
       .children
       .iter_mut()
@@ -173,7 +173,7 @@ impl VisitMut for ReverseProp {
       });
   }
 
-  fn visit_declaration(&mut self, decl: &mut Declaration) {
+  fn visit_declaration(&mut self, decl: &mut Declaration<'a>) {
     decl.prop.content = Cow::Owned(decl.prop.content.chars().rev().collect());
   }
 }
diff --git a/crates/recursive-parser/src/lib.rs b/crates/recursive-parser/src/lib.rs
@@ -11,11 +11,11 @@ pub struct AstPrinter {
 }
 
 impl AstPrinter {
-  pub fn print(&mut self, root: &parser::Root) {
+  pub fn print<'a>(&mut self, root: &'a parser::Root<'a>) {
     self.visit_root(root);
   }
 }
-impl Visit<()> for AstPrinter {
+impl<'a> Visit<'a, ()> for AstPrinter {
   fn visit_root(&mut self, root: &parser::Root) {
     println!(
       "{}Root@{:?}",
diff --git a/crates/recursive-parser/src/visitor.rs b/crates/recursive-parser/src/visitor.rs
@@ -1,15 +1,15 @@
 use crate::parser::{AtRule, Declaration, Root, Rule};
 
-pub trait Visit<R = ()> {
-  fn visit_root(&mut self, _root: &Root) -> R;
-  fn visit_rule(&mut self, _rule: &Rule) -> R;
-  fn visit_at_rule(&mut self, _at_rule: &AtRule) -> R;
-  fn visit_declaration(&mut self, _decl: &Declaration) -> R;
+pub trait Visit<'a, R = ()> {
+  fn visit_root(&mut self, _root: &Root<'a>) -> R;
+  fn visit_rule(&mut self, _rule: &Rule<'a>) -> R;
+  fn visit_at_rule(&mut self, _at_rule: &AtRule<'a>) -> R;
+  fn visit_declaration(&mut self, _decl: &Declaration<'a>) -> R;
 }
 
-pub trait VisitMut<R = ()> {
-  fn visit_root(&mut self, _root: &mut Root) -> R;
-  fn visit_rule(&mut self, _rule: &mut Rule) -> R;
-  fn visit_at_rule(&mut self, _at_rule: &mut AtRule) -> R;
-  fn visit_declaration(&mut self, _decl: &mut Declaration) -> R;
+pub trait VisitMut<'a, R = ()> {
+  fn visit_root(&mut self, _root: &mut Root<'a>) -> R;
+  fn visit_rule(&mut self, _rule: &mut Rule<'a>) -> R;
+  fn visit_at_rule(&mut self, _at_rule: &mut AtRule<'a>) -> R;
+  fn visit_declaration(&mut self, _decl: &mut Declaration<'a>) -> R;
 }

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ pub struct AstPrinter {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`impl AstPrinter {`
`14`		`- pub fn print(&mut self, root: &parser::Root) {`
	`14`	`+ pub fn print<'a>(&mut self, root: &'a parser::Root<'a>) {`
`15`	`15`	`self.visit_root(root);`
`16`	`16`	`}`
`17`	`17`	`}`
`18`		`-impl Visit<()> for AstPrinter {`
	`18`	`+impl<'a> Visit<'a, ()> for AstPrinter {`
`19`	`19`	`fn visit_root(&mut self, root: &parser::Root) {`
`20`	`20`	`println!(`
`21`	`21`	`"{}Root@{:?}",`