refactor(es/codegen): Revert swc-project#9248 (swc-project#9266)

kdy1 · Jul 17, 2024 · b9b233c · b9b233c
1 parent 1ae7967
commit b9b233c
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/swc_compiler_base/Cargo.toml b/crates/swc_compiler_base/Cargo.toml
@@ -21,7 +21,6 @@ rustc-hash = { workspace = true }
 serde      = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 sourcemap  = { workspace = true }
-swc_allocator = { version = "0.1.5", path = "../swc_allocator", default-features = false }
 
 swc_atoms = { version = "0.6.5", path = "../swc_atoms" }
 swc_common = { version = "0.35.0", path = "../swc_common", features = [

diff --git a/crates/swc_compiler_base/src/lib.rs b/crates/swc_compiler_base/src/lib.rs
@@ -171,10 +171,10 @@ where
 {
     let _timer = timer!("Compiler::print");
 
-    let mut src_map_buf = swc_allocator::vec::Vec::new();
+    let mut src_map_buf = vec![];
 
     let src = {
-        let mut buf = Vec::new();
+        let mut buf = vec![];
         {
             let mut w = swc_ecma_codegen::text_writer::JsWriter::new(
                 cm.clone(),

diff --git a/crates/swc_ecma_ast/src/stmt.rs b/crates/swc_ecma_ast/src/stmt.rs
@@ -164,7 +164,7 @@ impl Stmt {
     }
 }
 
-// Memory layout depends on the version of rustc.
+// Memory layout depedns on the version of rustc.
 // #[cfg(target_pointer_width = "64")]
 // assert_eq_size!(Stmt, [u8; 56]);
 

diff --git a/crates/swc_ecma_codegen/Cargo.toml b/crates/swc_ecma_codegen/Cargo.toml
@@ -25,7 +25,6 @@ serde      = { workspace = true }
 sourcemap  = { workspace = true }
 tracing    = { workspace = true }
 
-swc_allocator           = { version = "0.1.5", path = "../swc_allocator" }
 swc_atoms               = { version = "0.6.5", path = "../swc_atoms" }
 swc_common              = { version = "0.35.0", path = "../swc_common" }
 swc_ecma_ast            = { version = "0.116.0", path = "../swc_ecma_ast" }

diff --git a/crates/swc_ecma_codegen/benches/bench.rs b/crates/swc_ecma_codegen/benches/bench.rs
@@ -1,7 +1,6 @@
 extern crate swc_malloc;
 
 use codspeed_criterion_compat::{black_box, criterion_group, criterion_main, Bencher, Criterion};
-use swc_allocator::{vec::Vec, Allocator};
 use swc_common::FileName;
 use swc_ecma_codegen::Emitter;
 use swc_ecma_parser::{Parser, StringInput, Syntax};
@@ -85,6 +84,7 @@ fn bench_emitter(b: &mut Bencher, s: &str) {
         let fm = cm.new_source_file(FileName::Anon.into(), s.into());
         let mut parser = Parser::new(Syntax::default(), StringInput::from(&*fm), None);
 
+        let mut src_map_buf = vec![];
         let module = parser
             .parse_module()
             .map_err(|e| e.into_diagnostic(handler).emit())
@@ -95,11 +95,7 @@ fn bench_emitter(b: &mut Bencher, s: &str) {
         }
 
         b.iter(|| {
-            let alloc = Allocator::default();
-            let _guard = unsafe { alloc.guard() };
-            let mut src_map_buf = Vec::new();
-
-            let mut buf = Vec::new();
+            let mut buf = vec![];
             {
                 let mut emitter = Emitter {
                     cfg: Default::default(),

diff --git a/crates/swc_ecma_codegen/benches/with_parse.rs b/crates/swc_ecma_codegen/benches/with_parse.rs
@@ -1,7 +1,6 @@
 extern crate swc_malloc;
 
 use codspeed_criterion_compat::{black_box, criterion_group, criterion_main, Bencher, Criterion};
-use swc_allocator::vec::Vec;
 use swc_common::FileName;
 use swc_ecma_codegen::Emitter;
 use swc_ecma_parser::{Parser, StringInput, Syntax};
@@ -85,7 +84,7 @@ fn bench_emitter(b: &mut Bencher, s: &str) {
         b.iter(|| {
             let fm = cm.new_source_file(FileName::Anon.into(), s.into());
             let mut parser = Parser::new(Syntax::default(), StringInput::from(&*fm), None);
-            let mut src_map_buf = Vec::new();
+            let mut src_map_buf = vec![];
             let module = parser
                 .parse_module()
                 .map_err(|e| e.into_diagnostic(handler).emit())

diff --git a/crates/swc_ecma_codegen/examples/sourcemap.rs b/crates/swc_ecma_codegen/examples/sourcemap.rs
@@ -9,7 +9,6 @@ use std::{
     time::Instant,
 };
 
-use swc_allocator::vec::Vec;
 use swc_common::input::SourceFileInput;
 use swc_ecma_ast::*;
 use swc_ecma_codegen::{text_writer::JsWriter, Emitter};
@@ -31,7 +30,7 @@ fn parse_and_gen(entry: &Path) {
             .expect("failed to parse input as a module");
 
         let mut code = vec![];
-        let mut srcmap = Vec::new();
+        let mut srcmap = vec![];
 
         {
             let mut emitter = Emitter {
@@ -57,7 +56,7 @@ fn parse_and_gen(entry: &Path) {
     .expect("failed to process a module");
 }
 
-/// Usage: ./scripts/instruments path/to/input/file
+/// Usage: ./scripts/instruements path/to/input/file
 fn main() {
     let main_file = env::args().nth(1).unwrap();
 

diff --git a/crates/swc_ecma_codegen/src/tests.rs b/crates/swc_ecma_codegen/src/tests.rs
@@ -1,6 +1,5 @@
 use std::path::PathBuf;
 
-use swc_allocator::vec::Vec;
 use swc_common::{comments::SingleThreadedComments, FileName, SourceMap};
 use swc_ecma_parser;
 use swc_ecma_testing::{exec_node_js, JsExecOptions};
@@ -45,11 +44,11 @@ impl Builder {
     where
         F: for<'aa> FnOnce(&mut Emitter<'aa, Box<(dyn WriteJs + 'aa)>, SourceMap>),
     {
-        let mut buf = Vec::new();
+        let mut buf = vec![];
 
         self.with(src, &mut buf, op);
 
-        String::from_utf8_lossy(&buf).into_owned()
+        String::from_utf8(buf).unwrap()
     }
 }
 

diff --git a/crates/swc_ecma_codegen/src/text_writer/basic_impl.rs b/crates/swc_ecma_codegen/src/text_writer/basic_impl.rs
@@ -1,7 +1,6 @@
 use std::io::Write;
 
 use rustc_hash::FxHashSet;
-use swc_allocator::vec::Vec;
 use swc_common::{sync::Lrc, BytePos, LineCol, SourceMap, Span};
 
 use super::{Result, WriteJs};

diff --git a/crates/swc_ecma_codegen/tests/sourcemap.rs b/crates/swc_ecma_codegen/tests/sourcemap.rs
@@ -3,7 +3,6 @@ use std::{fs::read_to_string, path::PathBuf};
 use base64::prelude::{Engine, BASE64_STANDARD};
 use rustc_hash::FxHashSet;
 use sourcemap::SourceMap;
-use swc_allocator::vec::Vec;
 use swc_common::{comments::SingleThreadedComments, source_map::SourceMapGenConfig};
 use swc_ecma_ast::EsVersion;
 use swc_ecma_codegen::{text_writer::WriteJs, Emitter};
@@ -316,7 +315,7 @@ fn identity(entry: PathBuf) {
             Some(&comments),
         );
         let mut parser: Parser<Lexer> = Parser::new_from(lexer);
-        let mut src_map = Vec::new();
+        let mut src_map = vec![];
 
         {
             let mut wr = Box::new(swc_ecma_codegen::text_writer::JsWriter::new(

diff --git a/crates/swc_ecma_transforms_base/Cargo.toml b/crates/swc_ecma_transforms_base/Cargo.toml
@@ -34,7 +34,6 @@ swc_ecma_ast    = { version = "0.116.0", path = "../swc_ecma_ast" }
 swc_ecma_parser = { version = "0.147.0", path = "../swc_ecma_parser" }
 swc_ecma_utils  = { version = "0.132.0", path = "../swc_ecma_utils" }
 swc_ecma_visit  = { version = "0.102.0", path = "../swc_ecma_visit" }
-swc_allocator = { version = "0.1.5", path = "../swc_allocator", default-features = false }
 
 [dev-dependencies]
 codspeed-criterion-compat = { workspace = true }

diff --git a/crates/swc_ecma_transforms_react/Cargo.toml b/crates/swc_ecma_transforms_react/Cargo.toml
@@ -27,7 +27,6 @@ serde     = { workspace = true, features = ["derive"], optional = true }
 sha1      = { workspace = true }
 
 string_enum                = { version = "0.4.4", path = "../string_enum" }
-swc_allocator = { version = "0.1.5", path = "../swc_allocator", default-features = false }
 swc_atoms                  = { version = "0.6.5", path = "../swc_atoms" }
 swc_common                 = { version = "0.35.0", path = "../swc_common" }
 swc_config                 = { version = "0.1.13", path = "../swc_config" }

diff --git a/crates/swc_ecma_transforms_react/src/pure_annotations/tests.rs b/crates/swc_ecma_transforms_react/src/pure_annotations/tests.rs
@@ -1,4 +1,3 @@
-use swc_allocator::vec::Vec;
 use swc_common::{comments::SingleThreadedComments, sync::Lrc, FileName, Mark, SourceMap};
 use swc_ecma_codegen::{text_writer::JsWriter, Emitter};
 use swc_ecma_parser::{Parser, StringInput};
@@ -41,8 +40,8 @@ fn emit(
     comments: Lrc<SingleThreadedComments>,
     program: &Module,
 ) -> String {
-    let mut src_map_buf = Vec::new();
-    let mut buf = std::vec::Vec::new();
+    let mut src_map_buf = vec![];
+    let mut buf = vec![];
     {
         let writer = Box::new(JsWriter::new(
             source_map.clone(),

diff --git a/crates/swc_fast_ts_strip/Cargo.toml b/crates/swc_fast_ts_strip/Cargo.toml
@@ -13,7 +13,6 @@ version       = "0.3.0"
 [dependencies]
 anyhow = { workspace = true }
 serde  = { workspace = true, features = ["derive"] }
-swc_allocator = { version = "0.1.5", path = "../swc_allocator", default-features = false }
 
 swc_common = { version = "0.35.0", path = "../swc_common", features = [
   "sourcemap",

diff --git a/crates/swc_fast_ts_strip/src/lib.rs b/crates/swc_fast_ts_strip/src/lib.rs
@@ -241,7 +241,7 @@ pub fn operate(
 
             let mut src = vec![];
             let mut src_map_buf = if options.source_map {
-                Some(swc_allocator::vec::Vec::new())
+                Some(vec![])
             } else {
                 None
             };