Skip to content

Commit f544707

Browse files
committed
fix a name
1 parent 41a7d5e commit f544707

File tree

19 files changed

+23
-24
lines changed

19 files changed

+23
-24
lines changed

crates/next-core/src/next_client_reference/ecmascript_client_reference/ecmascript_client_reference_module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ impl Module for EcmascriptClientReferenceModule {
244244
#[turbo_tasks::function]
245245
fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
246246
// These just export some specially tagged functions
247-
ModuleSideEffects::DeclaredSideEffectFree.cell()
247+
ModuleSideEffects::SideEffectFree.cell()
248248
}
249249
}
250250

crates/next-core/src/raw_ecmascript_module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl Module for RawEcmascriptModule {
101101
#[turbo_tasks::function]
102102
fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
103103
// Is this correct?
104-
ModuleSideEffects::DeclaredSideEffectFree.cell()
104+
ModuleSideEffects::SideEffectFree.cell()
105105
}
106106
}
107107

turbopack/crates/turbopack-core/src/module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub enum StyleType {
1010
GlobalStyle,
1111
}
1212

13-
#[derive(Hash, Debug)]
13+
#[derive(Hash, Debug, Copy, Clone)]
1414
#[turbo_tasks::value(shared)]
1515
pub enum ModuleSideEffects {
1616
/// Analysis determined that the module evaluation is side effect free

turbopack/crates/turbopack-core/src/module_graph/side_effect_module_info.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ async fn compute_side_effect_free_module_info_single(
4848
super::SingleModuleGraphNode::VisitedModule { idx: _, module } => (
4949
*module,
5050
if parent_side_effect_free_modules.contains(module) {
51-
ModuleSideEffects::DeclaredSideEffectFree
51+
ModuleSideEffects::SideEffectFree
5252
} else {
5353
ModuleSideEffects::SideEffectful
5454
},
@@ -80,8 +80,7 @@ async fn compute_side_effect_free_module_info_single(
8080
|child, _parent, _s| {
8181
Ok(if let Some((child_module, _edge)) = child {
8282
match module_side_effects.get(&child_module).unwrap() {
83-
ModuleSideEffects::SideEffectful
84-
| ModuleSideEffects::DeclaredSideEffectFree => {
83+
ModuleSideEffects::SideEffectful | ModuleSideEffects::SideEffectFree => {
8584
// We have either already seen this or don't want to follow it
8685
GraphTraversalAction::Exclude
8786
}
@@ -104,7 +103,7 @@ async fn compute_side_effect_free_module_info_single(
104103
.into_iter()
105104
.filter_map(|(m, e)| match e {
106105
ModuleSideEffects::SideEffectful => None,
107-
ModuleSideEffects::DeclaredSideEffectFree => Some(m),
106+
ModuleSideEffects::SideEffectFree => Some(m),
108107
ModuleSideEffects::ModuleEvaluationIsSideEffectFree => {
109108
if locally_side_effect_free_modules_that_have_side_effects.contains(&m) {
110109
None

turbopack/crates/turbopack-ecmascript/src/async_chunk/module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl Module for AsyncLoaderModule {
6868

6969
#[turbo_tasks::function]
7070
fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
71-
ModuleSideEffects::DeclaredSideEffectFree.cell()
71+
ModuleSideEffects::SideEffectFree.cell()
7272
}
7373
}
7474

turbopack/crates/turbopack-ecmascript/src/inlined_bytes_module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ impl Module for InlinedBytesJsModule {
5252

5353
#[turbo_tasks::function]
5454
fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
55-
ModuleSideEffects::DeclaredSideEffectFree.cell()
55+
ModuleSideEffects::SideEffectFree.cell()
5656
}
5757
}
5858

turbopack/crates/turbopack-ecmascript/src/manifest/chunk_asset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ impl Module for ManifestAsyncModule {
154154

155155
#[turbo_tasks::function]
156156
fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
157-
ModuleSideEffects::DeclaredSideEffectFree.cell()
157+
ModuleSideEffects::SideEffectFree.cell()
158158
}
159159
}
160160

turbopack/crates/turbopack-ecmascript/src/references/esm/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ impl ModuleReference for EsmAssetReference {
419419

420420
if let Some(TreeShakingMode::ModuleFragments) = self.tree_shaking_mode {
421421
if let Some(ModulePart::Evaluation) = &self.export_name {
422-
if *self.module.side_effects().await? == ModuleSideEffects::DeclaredSideEffectFree {
422+
if *self.module.side_effects().await? == ModuleSideEffects::SideEffectFree {
423423
return Ok(ModuleResolveResult {
424424
primary: Box::new([(
425425
RequestKey::default(),

turbopack/crates/turbopack-ecmascript/src/references/esm/export.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ pub async fn follow_reexports(
170170
};
171171

172172
if !ignore_side_effects
173-
&& *module.side_effects().await? != ModuleSideEffects::DeclaredSideEffectFree
173+
&& *module.side_effects().await? != ModuleSideEffects::SideEffectFree
174174
{
175175
// TODO It's unfortunate that we have to use the whole module here.
176176
// This is often the Facade module, which includes all reexports.

turbopack/crates/turbopack-ecmascript/src/references/require_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ impl Module for RequireContextAsset {
429429

430430
#[turbo_tasks::function]
431431
fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
432-
ModuleSideEffects::DeclaredSideEffectFree.cell()
432+
ModuleSideEffects::SideEffectFree.cell()
433433
}
434434
}
435435

0 commit comments

Comments
 (0)