Merge #494

494: Fixing the Wasm blocker for Parser r=kdy1 a=anurbol

Rust has a [bug](rust-lang/rust#64450) when compiling a project for Wasm (with `--target wasm32-unknown-unknown` flag), these changes are a workaround.

These changes are only supposed to fix the SWC Parser, not the whole SWC project. This is because I only need the Parser at the moment, also fixing the whole SWC Project would be a nightmare for me, a newbie in SWC. Maybe later.

Co-authored-by: Nurbol Alpysbayev <anurbol@gmail.com>

Author: bors[bot]

ecmascript/parser/Cargo.toml

@@ -11,15 +11,15 @@ edition = "2018"
 [features]
 default = []
 # Requires nightly.
-fold = ["swc_common/fold", "ast/fold"]
+fold = ["swc_common/fold", "swc_ecma_ast/fold"]
 # Verify that expression is valid. Requires nightly.
 verify = ["fold"]
 
 [dependencies]
 swc_atoms = { version = "0.2", path ="../../atoms" }
 swc_common = { version = "0.4.0", path ="../../common" }
-ast = { package = "swc_ecma_ast", version = "0.10.0", path ="../ast" }
-parser_macros = { package = "swc_ecma_parser_macros", version = "0.4", path ="./macros" }
+swc_ecma_ast = { version = "0.10.0", path ="../ast" }
+swc_ecma_parser_macros = { package = "swc_ecma_parser_macros", version = "0.4", path ="./macros" }
 enum_kind = { version = "0.2", path ="../../macros/enum_kind" }
 unicode-xid = "0.2"
 log = { version = "0.4", features = ["release_max_level_debug"] }

ecmascript/parser/src/lexer.rs

@@ -15,7 +15,7 @@ use crate::{
     Context, JscTarget, Session, Syntax,
 };
 
-use ast::Str;
+use swc_ecma_ast::Str;
 use smallvec::{smallvec, SmallVec};
 use std::{char, iter::FusedIterator};
 use swc_atoms::JsWord;

ecmascript/parser/src/parser.rs

@@ -8,8 +8,8 @@ use crate::{
     token::{Token, Word},
     Context, JscTarget, Session, Syntax,
 };
-use ast::*;
-use parser_macros::parser;
+use swc_ecma_ast::*;
+use swc_ecma_parser_macros::parser;
 use std::ops::{Deref, DerefMut};
 use swc_atoms::JsWord;
 use swc_common::{comments::Comments, errors::DiagnosticBuilder, input::Input, BytePos, Span};

ecmascript/parser/src/parser/class_and_fn.rs

@@ -1,7 +1,7 @@
 use super::{ident::MaybeOptionalIdentParser, *};
 use crate::{error::SyntaxError, Tokens};
 use either::Either;
-use parser_macros::parser;
+use swc_ecma_parser_macros::parser;
 use swc_atoms::js_word;
 use swc_common::Spanned;
 

ecmascript/parser/src/parser/ident.rs

@@ -2,7 +2,7 @@
 use super::*;
 use crate::token::Keyword;
 use either::Either;
-use parser_macros::parser;
+use swc_ecma_parser_macros::parser;
 use swc_atoms::js_word;
 
 #[parser]

ecmascript/parser/src/token.rs

@@ -3,8 +3,8 @@
 //! [babel/bablyon]:https://github.com/babel/babel/blob/2d378d076eb0c5fe63234a8b509886005c01d7ee/packages/babylon/src/tokenizer/types.js
 pub(crate) use self::{AssignOpToken::*, BinOpToken::*, Keyword::*, Token::*};
 use crate::error::Error;
-pub(crate) use ast::AssignOp as AssignOpToken;
-use ast::{BinaryOp, Str};
+pub(crate) use swc_ecma_ast::AssignOp as AssignOpToken;
+use swc_ecma_ast::{BinaryOp, Str};
 use enum_kind::Kind;
 use std::{
     borrow::Cow,

ecmascript/parser/tests/jsx.rs

@@ -5,7 +5,7 @@
 
 extern crate test;
 
-use ast::*;
+use swc_ecma_ast::*;
 use pretty_assertions::assert_eq;
 use serde_json;
 use std::{

ecmascript/parser/tests/test262.rs

@@ -5,7 +5,7 @@
 
 extern crate test;
 
-use ast::*;
+use swc_ecma_ast::*;
 use std::{
     env,
     fs::{read_dir, File},