chore: update

Author: kermanx

crates/tree_shaker/src/consumable/mod.rs

@@ -3,7 +3,7 @@ mod impls;
 mod lazy;
 mod once;
 
-use crate::analyzer::Analyzer;
+use crate::{analyzer::Analyzer, entity::Entity};
 pub use collector::*;
 pub use lazy::*;
 pub use once::*;
@@ -14,39 +14,30 @@ pub trait ConsumableTrait<'a>: Debug {
   fn consume(&self, analyzer: &mut Analyzer<'a>);
 }
 
-pub trait IntoConsumable<'a> {
-  fn into_consumable(self, allocator: &'a Allocator) -> Consumable<'a>;
-}
-
-pub trait ConsumeTrait<'a>: Debug + IntoConsumable<'a> {
+pub trait ConsumeTrait<'a>: Debug {
   fn consume(&self, analyzer: &mut Analyzer<'a>);
-}
-
-impl<'a, T: ConsumableTrait<'a> + 'a> IntoConsumable<'a> for T {
-  fn into_consumable(self, allocator: &'a Allocator) -> Consumable<'a> {
-    Consumable(allocator.alloc(self))
-  }
+  fn uniform(self, allocator: &'a Allocator) -> Consumable<'a>;
 }
 
 impl<'a, T: ConsumableTrait<'a> + 'a> ConsumeTrait<'a> for T {
   fn consume(&self, analyzer: &mut Analyzer<'a>) {
     self.consume(analyzer);
   }
+  fn uniform(self, allocator: &'a Allocator) -> Consumable<'a> {
+    Consumable(allocator.alloc(self))
+  }
 }
 
 #[derive(Debug, Clone, Copy)]
 pub struct Consumable<'a>(pub &'a (dyn ConsumableTrait<'a> + 'a));
 
-impl<'a> IntoConsumable<'a> for Consumable<'a> {
-  fn into_consumable(self, _allocator: &'a Allocator) -> Consumable<'a> {
-    self
-  }
-}
-
 impl<'a> ConsumeTrait<'a> for Consumable<'a> {
   fn consume(&self, analyzer: &mut Analyzer<'a>) {
     self.0.consume(analyzer);
   }
+  fn uniform(self, _: &'a Allocator) -> Consumable<'a> {
+    self
+  }
 }
 
 pub type ConsumableVec<'a> = Vec<Consumable<'a>>;

crates/tree_shaker/src/entity/mod.rs

@@ -223,7 +223,7 @@ impl<'a> Entity<'a> {
     if let Some(d) = self.dep {
       analyzer.factory.consumable((d, dep))
     } else {
-      dep.into_consumable(analyzer.factory.allocator)
+      dep.uniform(analyzer.factory.allocator)
     }
   }
 
@@ -440,7 +440,7 @@ impl<'a> EntityFactory<'a> {
       dep: if let Some(d) = entity.dep {
         Some(self.consumable((d, dep)))
       } else {
-        Some(dep.into_consumable(self.allocator))
+        Some(dep.uniform(self.allocator))
       },
     }
   }

crates/tree_shaker/src/scope/mod.rs

@@ -10,7 +10,7 @@ pub mod variable_scope;
 
 use crate::{
   analyzer::Analyzer,
-  consumable::{Consumable, ConsumableVec, IntoConsumable},
+  consumable::{Consumable, ConsumableVec, ConsumeTrait},
   dep::DepId,
   entity::{Entity, EntityFactory, ObjectId},
   module::ModuleId,
@@ -208,10 +208,10 @@ impl<'a> Analyzer<'a> {
     self.push_cf_scope(CfScopeKind::Indeterminate, None);
   }
 
-  pub fn push_dependent_cf_scope(&mut self, dep: impl IntoConsumable<'a> + 'a) {
+  pub fn push_dependent_cf_scope(&mut self, dep: impl ConsumeTrait<'a> + 'a) {
     self.push_cf_scope_with_deps(
       CfScopeKind::Dependent,
-      vec![dep.into_consumable(self.allocator)],
+      vec![dep.uniform(self.allocator)],
       Some(false),
     );
   }