revert

Author: SyMind

src/helpers.rs

@@ -42,22 +42,21 @@ pub fn get_map<S: StreamChunks>(
     &mut |source_index, source, source_content| {
       let source_index = source_index as usize;
       if sources.len() <= source_index {
-        sources.resize(source_index + 1, "".into());
+        sources.resize(source_index + 1, "".to_string());
       }
       sources[source_index] = source.to_string();
       if let Some(source_content) = source_content {
         if sources_content.len() <= source_index {
-          sources_content.resize(source_index + 1, "".into());
+          sources_content.resize(source_index + 1, "".to_string());
         }
-        // TODO: avoid to_string allocation
         sources_content[source_index] = source_content.to_string();
       }
     },
     // on_name
     &mut |name_index, name| {
       let name_index = name_index as usize;
       if names.len() <= name_index {
-        names.resize(name_index + 1, "".into());
+        names.resize(name_index + 1, "".to_string());
       }
       names[name_index] = name.to_string();
     },
@@ -1220,7 +1219,6 @@ pub fn stream_and_get_source_and_map<'a, S: StreamChunks>(
         while sources_content.len() <= source_index2 {
           sources_content.push("".into());
         }
-        // TODO: avoid allocation here
         sources_content[source_index2] = source_content.to_string();
       }
       on_source(source_index, source, source_content);
@@ -1239,12 +1237,7 @@ pub fn stream_and_get_source_and_map<'a, S: StreamChunks>(
   let map = if mappings.is_empty() {
     None
   } else {
-    Some(SourceMap::new(
-      mappings.to_string(),
-      sources,
-      sources_content,
-      names,
-    ))
+    Some(SourceMap::new(mappings, sources, sources_content, names))
   };
   (generated_info, map)
 }

src/source_map.rs

@@ -243,8 +243,8 @@ impl PartialEq for SourceMapCell {
 impl Hash for SourceMapCell {
   fn hash<H: Hasher>(&self, state: &mut H) {
     match self {
-        SourceMapCell::Static(s) => s.hash(state),
-        SourceMapCell::Owned(owned) => owned.hash(state),
+      SourceMapCell::Static(s) => s.hash(state),
+      SourceMapCell::Owned(owned) => owned.hash(state),
     }
   }
 }
@@ -380,7 +380,7 @@ impl SourceMap {
   }
 
   /// Get the sources field in [SourceMap].
-  pub fn sources(&self) -> Box<dyn Iterator<Item = &str> + '_> {
+  pub fn sources(&self) -> Box<dyn Iterator<Item = &str> + Send + '_> {
     match &self.0 {
       SourceMapCell::Static(s) => {
         Box::new(s.borrow_dependent().sources.iter().copied())
@@ -409,7 +409,7 @@ impl SourceMap {
   }
 
   /// Get the sourcesContent field in [SourceMap].
-  pub fn sources_content(&self) -> Box<dyn Iterator<Item = &str> + '_> {
+  pub fn sources_content(&self) -> Box<dyn Iterator<Item = &str> + Send + '_> {
     match &self.0 {
       SourceMapCell::Static(s) => {
         Box::new(s.borrow_dependent().sources_content.iter().copied())
@@ -421,7 +421,7 @@ impl SourceMap {
   }
 
   /// Set the sourcesContent field in [SourceMap].
-  pub fn set_sources_content(&mut self, sources_content: Vec<String>) {
+  pub fn set_sources_content<T: Into<Arc<[String]>>>(&mut self, sources_content: T) {
     self.ensure_owned().sources_content = sources_content.into()
   }
 
@@ -438,7 +438,7 @@ impl SourceMap {
   }
 
   /// Get the names field in [SourceMap].
-  pub fn names(&self) -> Box<dyn Iterator<Item = &str> + '_> {
+  pub fn names(&self) -> Box<dyn Iterator<Item = &str> + Send + '_> {
     match &self.0 {
       SourceMapCell::Static(s) => {
         Box::new(s.borrow_dependent().names.iter().copied())

src/source_map_source.rs

@@ -453,15 +453,11 @@ mod tests {
     }
 
     test_cached!(source, |s: &dyn Source| s.source().to_string());
-    // test_cached!(source, |s: &dyn Source| s
-    //   .map(&MapOptions::default())
-    //   .map(|m| m.into_owned()));
-    // test_cached!(source, |s: &dyn Source| s
-    //   .map(&MapOptions {
-    //     columns: false,
-    //     final_source: true
-    //   })
-    //   .map(|m| m.into_owned()));
+    test_cached!(source, |s: &dyn Source| s.map(&MapOptions::default()));
+    test_cached!(source, |s: &dyn Source| s.map(&MapOptions {
+      columns: false,
+      final_source: true
+    }));
   }
 
   #[test]