Skip to content

Commit e557f4a

Browse files
kdy1kdy1
committed
fmt
1 parent 27c5761 commit e557f4a

File tree

14 files changed

+108
-78
lines changed

14 files changed

+108
-78
lines changed

‎crates/next-core/src/next_client/context.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,9 @@ pub async fn get_client_compile_time_info(
107107
.resolved_cell();
108108

109109
CompileTimeInfo::builder(
110-
Environment::new(ExecutionEnvironment::Browser(
111-
environment,
112-
),*environment)
113-
.to_resolved()
114-
.await?,
110+
Environment::new(ExecutionEnvironment::Browser(environment), *environment)
111+
.to_resolved()
112+
.await?,
115113
)
116114
.defines(next_client_defines(define_env).to_resolved().await?)
117115
.free_var_references(next_client_free_vars(define_env).to_resolved().await?)

‎turbopack/crates/turbopack-cli/src/build/mod.rs‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,12 @@ async fn build_internal(
237237
build_output_root.clone(),
238238
build_output_root.clone(),
239239
build_output_root.clone(),
240-
Environment::new(ExecutionEnvironment::NodeJsLambda(
241-
NodeJsEnvironment::default().resolved_cell(),
242-
),compile_time_info.css_environment())
240+
Environment::new(
241+
ExecutionEnvironment::NodeJsLambda(
242+
NodeJsEnvironment::default().resolved_cell(),
243+
),
244+
compile_time_info.css_environment(),
245+
)
243246
.to_resolved()
244247
.await?,
245248
runtime_type,
@@ -336,9 +339,10 @@ async fn build_internal(
336339
build_output_root.clone(),
337340
build_output_root.clone(),
338341
build_output_root.clone(),
339-
Environment::new(ExecutionEnvironment::Browser(
340-
browser_environment,
341-
),*browser_environment)
342+
Environment::new(
343+
ExecutionEnvironment::Browser(browser_environment),
344+
*browser_environment,
345+
)
342346
.to_resolved()
343347
.await?,
344348
runtime_type,
@@ -384,9 +388,12 @@ async fn build_internal(
384388
build_output_root.clone(),
385389
build_output_root.clone(),
386390
build_output_root.clone(),
387-
Environment::new(ExecutionEnvironment::NodeJsLambda(
388-
NodeJsEnvironment::default().resolved_cell(),
389-
),BrowserEnvironment::default().cell())
391+
Environment::new(
392+
ExecutionEnvironment::NodeJsLambda(
393+
NodeJsEnvironment::default().resolved_cell(),
394+
),
395+
BrowserEnvironment::default().cell(),
396+
)
390397
.to_resolved()
391398
.await?,
392399
runtime_type,

‎turbopack/crates/turbopack-cli/src/contexts.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,9 @@ pub async fn get_client_compile_time_info(
209209
.resolved_cell();
210210

211211
CompileTimeInfo::builder(
212-
Environment::new(ExecutionEnvironment::Browser(
213-
environment,
214-
),*environment)
215-
.to_resolved()
216-
.await?,
212+
Environment::new(ExecutionEnvironment::Browser(environment), *environment)
213+
.to_resolved()
214+
.await?,
217215
)
218216
.defines(client_defines(&node_env).resolved_cell())
219217
.free_var_references(

‎turbopack/crates/turbopack-cli/src/dev/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ async fn source(
271271

272272
let env = load_env(root_path.clone());
273273
let build_output_root = output_fs.root().await?.join(".turbopack/build")?;
274-
274+
275275
let build_output_root_to_root_path = project_path
276276
.join(".turbopack/build")?
277277
.get_relative_path_to(&root_path)

‎turbopack/crates/turbopack-ecmascript/benches/analyzer.rs‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ use turbo_tasks::ResolvedVc;
1414
use turbo_tasks_testing::VcStorage;
1515
use turbopack_core::{
1616
compile_time_info::CompileTimeInfo,
17-
environment::{BrowserEnvironment, Environment, ExecutionEnvironment, NodeJsEnvironment, NodeJsVersion},
17+
environment::{
18+
BrowserEnvironment, Environment, ExecutionEnvironment, NodeJsEnvironment, NodeJsVersion,
19+
},
1820
target::CompileTarget,
1921
};
2022
use turbopack_ecmascript::analyzer::{
@@ -105,15 +107,17 @@ fn bench_link(b: &mut Bencher, input: &BenchInput) {
105107
let css_environment = BrowserEnvironment::default().cell();
106108

107109
let compile_time_info = CompileTimeInfo::builder(
108-
Environment::new(ExecutionEnvironment::NodeJsLambda(
109-
NodeJsEnvironment {
110-
compile_target: CompileTarget::unknown().to_resolved().await?,
111-
node_version: NodeJsVersion::default().resolved_cell(),
112-
cwd: ResolvedVc::cell(None),
113-
}
114-
.resolved_cell(),
115-
116-
), css_environment,)
110+
Environment::new(
111+
ExecutionEnvironment::NodeJsLambda(
112+
NodeJsEnvironment {
113+
compile_target: CompileTarget::unknown().to_resolved().await?,
114+
node_version: NodeJsVersion::default().resolved_cell(),
115+
cwd: ResolvedVc::cell(None),
116+
}
117+
.resolved_cell(),
118+
),
119+
css_environment,
120+
)
117121
.to_resolved()
118122
.await?,
119123
)

‎turbopack/crates/turbopack-ecmascript/benches/references.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ pub fn benchmark(c: &mut Criterion) {
4141
let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/benches/");
4242
let fs = DiskFileSystem::new(rcstr!("project"), root_dir.to_str().unwrap().into());
4343

44-
let environment = Environment::new(ExecutionEnvironment::NodeJsLambda(
45-
NodeJsEnvironment::default().resolved_cell(),
46-
),BrowserEnvironment::default().cell());
44+
let environment = Environment::new(
45+
ExecutionEnvironment::NodeJsLambda(NodeJsEnvironment::default().resolved_cell()),
46+
BrowserEnvironment::default().cell(),
47+
);
4748
let compile_time_info = CompileTimeInfo::new(environment).to_resolved().await?;
4849
let layer = Layer::new(rcstr!("test"));
4950
let module_asset_context = NoopAssetContext {

‎turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3777,7 +3777,9 @@ mod tests {
37773777
use turbo_tasks::{ResolvedVc, util::FormatDuration};
37783778
use turbopack_core::{
37793779
compile_time_info::CompileTimeInfo,
3780-
environment::{BrowserEnvironment, Environment, ExecutionEnvironment, NodeJsEnvironment, NodeJsVersion},
3780+
environment::{
3781+
BrowserEnvironment, Environment, ExecutionEnvironment, NodeJsEnvironment, NodeJsVersion,
3782+
},
37813783
target::{Arch, CompileTarget, Endianness, Libc, Platform},
37823784
};
37833785

@@ -4180,20 +4182,23 @@ mod tests {
41804182
let css_environment = BrowserEnvironment::default().resolved_cell();
41814183

41824184
let compile_time_info = CompileTimeInfo::builder(
4183-
Environment::new(ExecutionEnvironment::NodeJsLambda(
4184-
NodeJsEnvironment {
4185-
compile_target: CompileTarget {
4186-
arch: Arch::X64,
4187-
platform: Platform::Linux,
4188-
endianness: Endianness::Little,
4189-
libc: Libc::Glibc,
4185+
Environment::new(
4186+
ExecutionEnvironment::NodeJsLambda(
4187+
NodeJsEnvironment {
4188+
compile_target: CompileTarget {
4189+
arch: Arch::X64,
4190+
platform: Platform::Linux,
4191+
endianness: Endianness::Little,
4192+
libc: Libc::Glibc,
4193+
}
4194+
.resolved_cell(),
4195+
node_version: NodeJsVersion::default().resolved_cell(),
4196+
cwd: ResolvedVc::cell(None),
41904197
}
41914198
.resolved_cell(),
4192-
node_version: NodeJsVersion::default().resolved_cell(),
4193-
cwd: ResolvedVc::cell(None),
4194-
}
4195-
.resolved_cell(),
4196-
),*css_environment)
4199+
),
4200+
*css_environment,
4201+
)
41974202
.to_resolved()
41984203
.await?,
41994204
)

‎turbopack/crates/turbopack-nft/src/nft.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use turbopack_core::{
1515
environment::{BrowserEnvironment, Environment, ExecutionEnvironment, NodeJsEnvironment},
1616
file_source::FileSource,
1717
ident::Layer,
18-
issue::{handle_issues, IssueReporter, IssueSeverity},
18+
issue::{IssueReporter, IssueSeverity, handle_issues},
1919
output::OutputAsset,
2020
reference::all_assets_from_entries,
2121
reference_type::ReferenceType,
@@ -69,9 +69,10 @@ async fn node_file_trace_operation(
6969
let input = input_dir.join(&format!("{input}"))?;
7070

7171
let source = FileSource::new(input);
72-
let environment = Environment::new(ExecutionEnvironment::NodeJsLambda(
73-
NodeJsEnvironment::default().resolved_cell(),
74-
),BrowserEnvironment::default().cell());
72+
let environment = Environment::new(
73+
ExecutionEnvironment::NodeJsLambda(NodeJsEnvironment::default().resolved_cell()),
74+
BrowserEnvironment::default().cell(),
75+
);
7576
let module_asset_context = ModuleAssetContext::new(
7677
Default::default(),
7778
// This config should be kept in sync with

‎turbopack/crates/turbopack-tests/tests/execution.rs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ use turbopack_core::{
4141
ident::Layer,
4242
issue::IssueDescriptionExt,
4343
module_graph::{
44-
chunk_group_info::ChunkGroupEntry, export_usage::compute_export_usage_info, ModuleGraph
44+
ModuleGraph, chunk_group_info::ChunkGroupEntry, export_usage::compute_export_usage_info,
4545
},
4646
reference_type::{InnerAssets, ReferenceType},
4747
resolve::{
48-
options::{ImportMap, ImportMapping}, ExternalTraced, ExternalType
48+
ExternalTraced, ExternalType,
49+
options::{ImportMap, ImportMapping},
4950
},
5051
};
5152
use turbopack_ecmascript_runtime::RuntimeType;
@@ -351,9 +352,10 @@ async fn run_test_operation(prepared_test: ResolvedVc<PreparedTest>) -> Result<V
351352
.get_relative_path_to(project_root)
352353
.context("Project path is in root path")?;
353354

354-
let env = Environment::new(ExecutionEnvironment::NodeJsBuildTime(
355-
NodeJsEnvironment::default().resolved_cell(),
356-
),BrowserEnvironment::default().cell())
355+
let env = Environment::new(
356+
ExecutionEnvironment::NodeJsBuildTime(NodeJsEnvironment::default().resolved_cell()),
357+
BrowserEnvironment::default().cell(),
358+
)
357359
.to_resolved()
358360
.await?;
359361

‎turbopack/crates/turbopack-tests/tests/snapshot.rs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -285,17 +285,18 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
285285
}
286286
.resolved_cell();
287287

288-
Environment::new(ExecutionEnvironment::Browser(
289-
environment,
290-
),*environment)
291-
.to_resolved()
292-
.await?
288+
Environment::new(ExecutionEnvironment::Browser(environment), *environment)
289+
.to_resolved()
290+
.await?
293291
}
294292
SnapshotEnvironment::NodeJs => {
295-
Environment::new( ExecutionEnvironment::NodeJsBuildTime(
296-
// TODO: load more from options.json
297-
NodeJsEnvironment::default().resolved_cell(),
298-
),BrowserEnvironment::default().cell())
293+
Environment::new(
294+
ExecutionEnvironment::NodeJsBuildTime(
295+
// TODO: load more from options.json
296+
NodeJsEnvironment::default().resolved_cell(),
297+
),
298+
BrowserEnvironment::default().cell(),
299+
)
299300
.to_resolved()
300301
.await?
301302
}

0 commit comments

Comments
 (0)