From 1b55219e7a36ff06cb6cd71795f546d22bfe443f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Thu, 16 Jan 2025 15:33:09 +0900 Subject: [PATCH] refactor(turbopack): Atom and JsWord is same type --- .../crates/turbopack-ecmascript/src/analyzer/mod.rs | 10 ++++------ .../crates/turbopack-ecmascript/src/references/mod.rs | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs b/turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs index e8036bde63a43..c143ffbc842fd 100644 --- a/turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs +++ b/turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs @@ -99,7 +99,6 @@ impl Eq for ConstantNumber {} #[derive(Debug, Clone)] pub enum ConstantString { - Word(JsWord), Atom(Atom), RcStr(RcStr), } @@ -107,7 +106,6 @@ pub enum ConstantString { impl ConstantString { pub fn as_str(&self) -> &str { match self { - Self::Word(s) => s, Self::Atom(s) => s, Self::RcStr(s) => s, } @@ -146,7 +144,7 @@ impl From for ConstantString { impl From<&'static str> for ConstantString { fn from(v: &'static str) -> Self { - ConstantString::Word(v.into()) + ConstantString::Atom(v.into()) } } @@ -236,14 +234,14 @@ impl From for ConstantValue { impl From<&'_ str> for ConstantValue { fn from(v: &str) -> Self { - ConstantValue::Str(ConstantString::Word(v.into())) + ConstantValue::Str(ConstantString::Atom(v.into())) } } impl From for ConstantValue { fn from(v: Lit) -> Self { match v { - Lit::Str(v) => ConstantValue::Str(ConstantString::Word(v.value)), + Lit::Str(v) => ConstantValue::Str(ConstantString::Atom(v.value)), Lit::Bool(v) => { if v.value { ConstantValue::True @@ -511,7 +509,7 @@ pub enum JsValue { impl From<&'_ str> for JsValue { fn from(v: &str) -> Self { - ConstantValue::Str(ConstantString::Word(v.into())).into() + ConstantValue::Str(ConstantString::Atom(v.into())).into() } } diff --git a/turbopack/crates/turbopack-ecmascript/src/references/mod.rs b/turbopack/crates/turbopack-ecmascript/src/references/mod.rs index 45fffe94554d0..3fd7ceb147056 100644 --- a/turbopack/crates/turbopack-ecmascript/src/references/mod.rs +++ b/turbopack/crates/turbopack-ecmascript/src/references/mod.rs @@ -3381,7 +3381,7 @@ fn is_invoking_node_process_eval(args: &[JsValue]) -> bool { { // Is `-e` one of the arguments passed to the program? if items.iter().any(|e| { - if let JsValue::Constant(JsConstantValue::Str(ConstantString::Word(arg))) = + if let JsValue::Constant(JsConstantValue::Str(ConstantString::Atom(arg))) = e { arg == "-e"