refactor

Author: SyMind

src/cached_source.rs

@@ -13,7 +13,7 @@ use crate::{
   },
   rope::Rope,
   source::SourceValue,
-  BoxSource, MapOptions, MemoryPool, Source, SourceExt, SourceMap,
+  BoxSource, MapOptions, Source, SourceExt, SourceMap,
 };
 
 #[derive(Default)]
@@ -122,7 +122,6 @@ impl Source for CachedSource {
 impl StreamChunks for CachedSource {
   fn stream_chunks<'a>(
     &'a self,
-    memory_pool: &'a MemoryPool,
     options: &MapOptions,
     on_chunk: crate::helpers::OnChunk<'_, 'a>,
     on_source: crate::helpers::OnSource<'_, 'a>,
@@ -138,13 +137,7 @@ impl StreamChunks for CachedSource {
         let source = self.rope();
         if let Some(map) = map {
           stream_chunks_of_source_map(
-            memory_pool,
-            source,
-            map,
-            on_chunk,
-            on_source,
-            on_name,
-            options,
+            source, map, on_chunk, on_source, on_name, options,
           )
         } else {
           stream_chunks_of_raw_source(
@@ -154,7 +147,6 @@ impl StreamChunks for CachedSource {
       }
       None => {
         let (generated_info, map) = stream_and_get_source_and_map(
-          memory_pool,
           &self.inner,
           options,
           on_chunk,
@@ -316,7 +308,6 @@ mod tests {
     let mut on_source_count = 0;
     let mut on_name_count = 0;
     let generated_info = source.stream_chunks(
-      &MemoryPool::default(),
       &map_options,
       &mut |_chunk, _mapping| {
         on_chunk_count += 1;
@@ -331,7 +322,6 @@ mod tests {
 
     let cached_source = CachedSource::new(source);
     cached_source.stream_chunks(
-      &MemoryPool::default(),
       &map_options,
       &mut |_chunk, _mapping| {},
       &mut |_source_index, _source, _source_content| {},
@@ -342,7 +332,6 @@ mod tests {
     let mut cached_on_source_count = 0;
     let mut cached_on_name_count = 0;
     let cached_generated_info = cached_source.stream_chunks(
-      &MemoryPool::default(),
       &map_options,
       &mut |_chunk, _mapping| {
         cached_on_chunk_count += 1;

src/concat_source.rs

@@ -11,8 +11,8 @@ use crate::{
   helpers::{get_map, GeneratedInfo, OnChunk, OnName, OnSource, StreamChunks},
   linear_map::LinearMap,
   source::{Mapping, OriginalLocation},
-  BoxSource, MapOptions, MemoryPool, RawStringSource, Rope, Source, SourceExt,
-  SourceMap, SourceValue,
+  BoxSource, MapOptions, RawStringSource, Rope, Source, SourceExt, SourceMap,
+  SourceValue,
 };
 
 /// Concatenate multiple [Source]s to a single [Source].
@@ -200,7 +200,7 @@ impl Source for ConcatSource {
   }
 
   fn map(&self, options: &MapOptions) -> Option<SourceMap> {
-    get_map(&MemoryPool::default(), self, options)
+    get_map(self, options)
   }
 
   fn to_writer(&self, writer: &mut dyn std::io::Write) -> std::io::Result<()> {
@@ -230,7 +230,6 @@ impl Eq for ConcatSource {}
 impl StreamChunks for ConcatSource {
   fn stream_chunks<'a>(
     &'a self,
-    memory_pool: &'a MemoryPool,
     options: &MapOptions,
     on_chunk: OnChunk<'_, 'a>,
     on_source: OnSource<'_, 'a>,
@@ -239,13 +238,7 @@ impl StreamChunks for ConcatSource {
     let children = self.optimized_children();
 
     if children.len() == 1 {
-      return children[0].stream_chunks(
-        memory_pool,
-        options,
-        on_chunk,
-        on_source,
-        on_name,
-      );
+      return children[0].stream_chunks(options, on_chunk, on_source, on_name);
     }
     let mut current_line_offset = 0;
     let mut current_column_offset = 0;
@@ -266,7 +259,6 @@ impl StreamChunks for ConcatSource {
         generated_line,
         generated_column,
       } = item.stream_chunks(
-        memory_pool,
         options,
         &mut |chunk, mapping| {
           let line = mapping.generated_line + current_line_offset;

src/helpers.rs

@@ -13,16 +13,14 @@ use crate::{
   linear_map::LinearMap,
   source::{Mapping, OriginalLocation},
   with_indices::WithIndices,
-  MapOptions, MemoryPool, Rope, SourceMap,
+  MapOptions, Rope, SourceMap,
 };
 
 // Adding this type because sourceContentLine not happy
-type InnerSourceContentLine<'context, 'text> = RefCell<
-  LinearMap<OnceCell<Option<Vec<WithIndices<'context, 'text, Rope<'text>>>>>>,
->;
+type InnerSourceContentLine<'text> =
+  RefCell<LinearMap<OnceCell<Option<Vec<WithIndices<'text, Rope<'text>>>>>>>;
 
 pub fn get_map<'a, S: StreamChunks>(
-  memory_pool: &'a MemoryPool,
   stream: &'a S,
   options: &'a MapOptions,
 ) -> Option<SourceMap> {
@@ -32,7 +30,6 @@ pub fn get_map<'a, S: StreamChunks>(
   let mut names: Vec<String> = Vec::new();
 
   stream.stream_chunks(
-    memory_pool,
     &MapOptions {
       columns: options.columns,
       final_source: true,
@@ -74,7 +71,6 @@ pub trait StreamChunks {
   /// [StreamChunks] abstraction
   fn stream_chunks<'a>(
     &'a self,
-    memory_pool: &'a MemoryPool,
     options: &MapOptions,
     on_chunk: OnChunk<'_, 'a>,
     on_source: OnSource<'_, 'a>,
@@ -94,7 +90,6 @@ pub type OnName<'a, 'b> = &'a mut dyn FnMut(u32, Cow<'b, str>);
 
 /// Default stream chunks behavior impl, see [webpack-sources streamChunks](https://github.com/webpack/webpack-sources/blob/9f98066311d53a153fdc7c633422a1d086528027/lib/helpers/streamChunks.js#L15-L35).
 pub fn stream_chunks_default<'a, S>(
-  memory_pool: &'a MemoryPool,
   source: S,
   source_map: Option<&'a SourceMap>,
   options: &MapOptions,
@@ -107,13 +102,7 @@ where
 {
   if let Some(map) = source_map {
     stream_chunks_of_source_map(
-      memory_pool,
-      source,
-      map,
-      on_chunk,
-      on_source,
-      on_name,
-      options,
+      source, map, on_chunk, on_source, on_name, options,
     )
   } else {
     stream_chunks_of_raw_source(source, options, on_chunk, on_source, on_name)
@@ -314,7 +303,6 @@ where
 }
 
 pub fn stream_chunks_of_source_map<'a, S>(
-  memory_pool: &'a MemoryPool,
   source: S,
   source_map: &'a SourceMap,
   on_chunk: OnChunk<'_, 'a>,
@@ -336,12 +324,7 @@ where
       columns: true,
       final_source: false,
     } => stream_chunks_of_source_map_full(
-      memory_pool,
-      source,
-      source_map,
-      on_chunk,
-      on_source,
-      on_name,
+      source, source_map, on_chunk, on_source, on_name,
     ),
     MapOptions {
       columns: false,
@@ -432,7 +415,6 @@ where
 }
 
 fn stream_chunks_of_source_map_full<'a, S>(
-  memory_pool: &'a MemoryPool,
   source: S,
   source_map: &'a SourceMap,
   on_chunk: OnChunk<'_, 'a>,
@@ -443,9 +425,8 @@ where
   S: SourceText<'a> + 'a,
 {
   let lines = split_into_lines(&source);
-  let line_with_indices_list = lines
-    .map(|line| WithIndices::new(memory_pool, line))
-    .collect::<Vec<_>>();
+  let line_with_indices_list =
+    lines.map(|line| WithIndices::new(line)).collect::<Vec<_>>();
 
   if line_with_indices_list.is_empty() {
     return GeneratedInfo {
@@ -732,7 +713,6 @@ type InnerSourceIndexValueMapping<'a> =
 
 #[allow(clippy::too_many_arguments)]
 pub fn stream_chunks_of_combined_source_map<'a, S>(
-  memory_pool: &'a MemoryPool,
   source: S,
   source_map: &'a SourceMap,
   inner_source_name: &'a str,
@@ -798,7 +778,6 @@ where
   };
 
   stream_chunks_of_source_map(
-    memory_pool,
     source.clone(),
     source_map,
     &mut |chunk, mapping| {
@@ -854,7 +833,7 @@ where
                     match inner_source_contents.get(&inner_source_index) {
                       Some(Some(source_content)) => Some(
                         split_into_lines(source_content)
-                          .map(|line| WithIndices::new(memory_pool, line))
+                          .map(|line| WithIndices::new(line))
                           .collect(),
                       ),
                       _ => None,
@@ -954,7 +933,7 @@ where
                     match inner_source_contents.get(&inner_source_index) {
                       Some(Some(source_content)) => Some(
                         split_into_lines(source_content)
-                          .map(|line| WithIndices::new(memory_pool, line))
+                          .map(|line| WithIndices::new(line))
                           .collect(),
                       ),
                       _ => None,
@@ -1119,7 +1098,6 @@ where
         }
         source_index_mapping.borrow_mut().insert(i, -2);
         stream_chunks_of_source_map(
-          memory_pool,
           source_content.unwrap(),
           inner_source_map,
           &mut |chunk, mapping| {
@@ -1217,7 +1195,6 @@ where
 }
 
 pub fn stream_and_get_source_and_map<'a, S: StreamChunks>(
-  memory_pool: &'a MemoryPool,
   input_source: &'a S,
   options: &MapOptions,
   on_chunk: OnChunk<'_, 'a>,
@@ -1230,7 +1207,6 @@ pub fn stream_and_get_source_and_map<'a, S: StreamChunks>(
   let mut names: Vec<String> = Vec::new();
 
   let generated_info = input_source.stream_chunks(
-    memory_pool,
     options,
     &mut |chunk, mapping| {
       mappings_encoder.encode(&mapping);

src/lib.rs

@@ -19,7 +19,6 @@ mod with_indices;
 pub use cached_source::CachedSource;
 pub use concat_source::ConcatSource;
 pub use error::{Error, Result};
-pub use memory_pool::MemoryPool;
 pub use original_source::OriginalSource;
 pub use raw_source::{RawBufferSource, RawStringSource};
 pub use replace_source::{ReplaceSource, ReplacementEnforce};