Skip to content

Commit

Permalink
chore: format code
Browse files Browse the repository at this point in the history
  • Loading branch information
ClarkXia committed Feb 6, 2024
1 parent f5f18eb commit aecb435
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 38 deletions.
2 changes: 1 addition & 1 deletion crates/binding_options/src/options/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl RSPackRawOptions {
if self.features.assets_manifest.unwrap_or_default() {
plugins.push(Box::new(plugin_manifest::ManifestPlugin::new()));
}

let mut builtins = self.builtins.apply(plugins)?;
if experiments.rspack_future.new_treeshaking {
builtins.tree_shaking = TreeShaking::False;
Expand Down
33 changes: 17 additions & 16 deletions crates/loader_barrel/tests/fixtures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ use std::{
env, fs,
path::{Path, PathBuf},
str::FromStr,
sync::Arc, vec,
sync::Arc,
vec,
};

use loader_barrel::{BarrelLoader, LoaderOptions};
use rspack_core::{
run_loaders, CompilerContext, CompilerOptions, Loader, LoaderRunnerContext, ResourceData,
SideEffectOption, ResolverFactory, PluginDriver,
run_loaders, CompilerContext, CompilerOptions, Loader, LoaderRunnerContext, PluginDriver,
ResolverFactory, ResourceData, SideEffectOption,
};
use rspack_util::source_map::SourceMapKind;
use swc_core::base::config::Config;
Expand Down Expand Up @@ -88,13 +89,15 @@ async fn loader_test(actual: impl AsRef<Path>, expected: impl AsRef<Path>) {
profile: false,
};

let (plugin_driver, compiler_options) =
PluginDriver::new(compiler_options, vec![], Arc::new(
ResolverFactory::new(
rspack_core::Resolve { extensions: Some(vec![".js".to_string()]),
..Default::default()
}
)), &mut Default::default());
let (plugin_driver, compiler_options) = PluginDriver::new(
compiler_options,
vec![],
Arc::new(ResolverFactory::new(rspack_core::Resolve {
extensions: Some(vec![".js".to_string()]),
..Default::default()
})),
&mut Default::default(),
);

let (result, _) = run_loaders(
&[Arc::new(BarrelLoader::new(LoaderOptions {
Expand All @@ -105,12 +108,10 @@ async fn loader_test(actual: impl AsRef<Path>, expected: impl AsRef<Path>) {
&[],
CompilerContext {
options: Arc::clone(&compiler_options),
resolver_factory: Arc::new(
ResolverFactory::new(
rspack_core::Resolve { extensions: Some(vec![".js".to_string()]),
..Default::default()
}
)),
resolver_factory: Arc::new(ResolverFactory::new(rspack_core::Resolve {
extensions: Some(vec![".js".to_string()]),
..Default::default()
})),
module: "".into(),
module_context: None,
module_source_map_kind: SourceMapKind::SourceMap,
Expand Down
2 changes: 1 addition & 1 deletion crates/loader_compilation/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use rspack_plugin_javascript::{
ast::{self, SourceMapConfig},
TransformOutput,
};
use rspack_util::source_map::SourceMapKind;
use rspack_regex::RspackRegex;
use rspack_util::source_map::SourceMapKind;
use serde::Deserialize;
use swc_config::{config_types::MergingOption, merge::Merge};
use swc_core::{
Expand Down
32 changes: 16 additions & 16 deletions crates/loader_compilation/tests/fixtures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ use std::{
use loader_compilation::{CompilationLoader, LoaderOptions};
use rspack_ast::RspackAst;
use rspack_core::{
run_loaders, CompilerContext, CompilerOptions, Loader, LoaderRunnerContext, ResourceData,
SideEffectOption, ResolverFactory, PluginDriver,
run_loaders, CompilerContext, CompilerOptions, Loader, LoaderRunnerContext, PluginDriver,
ResolverFactory, ResourceData, SideEffectOption,
};
use rspack_util::source_map::SourceMapKind;
use rspack_plugin_javascript::ast;
use rspack_util::source_map::SourceMapKind;
use swc_core::base::config::Config;
use swc_core::ecma::ast::EsVersion;

Expand Down Expand Up @@ -90,13 +90,15 @@ async fn loader_test(actual: impl AsRef<Path>, expected: impl AsRef<Path>) {
profile: false,
};

let (plugin_driver, compiler_options) =
PluginDriver::new(compiler_options, vec![], Arc::new(
ResolverFactory::new(
rspack_core::Resolve { extensions: Some(vec![".js".to_string()]),
..Default::default()
}
)), &mut Default::default());
let (plugin_driver, compiler_options) = PluginDriver::new(
compiler_options,
vec![],
Arc::new(ResolverFactory::new(rspack_core::Resolve {
extensions: Some(vec![".js".to_string()]),
..Default::default()
})),
&mut Default::default(),
);
let (result, _) = run_loaders(
&[Arc::new(CompilationLoader::new(LoaderOptions {
swc_options: options,
Expand All @@ -107,12 +109,10 @@ async fn loader_test(actual: impl AsRef<Path>, expected: impl AsRef<Path>) {
&[],
CompilerContext {
options: Arc::clone(&compiler_options),
resolver_factory: Arc::new(
ResolverFactory::new(
rspack_core::Resolve { extensions: Some(vec![".js".to_string()]),
..Default::default()
}
)),
resolver_factory: Arc::new(ResolverFactory::new(rspack_core::Resolve {
extensions: Some(vec![".js".to_string()]),
..Default::default()
})),
module: "".into(),
module_context: None,
module_source_map_kind: SourceMapKind::SourceMap,
Expand Down
6 changes: 2 additions & 4 deletions crates/swc_compiler/src/compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ use anyhow::{Context, Error};
use dashmap::DashMap;
use rspack_ast::javascript::{Ast as JsAst, Context as JsAstContext, Program as JsProgram};
use swc_config::config_types::BoolOr;
use swc_core::base::config::{
BuiltInput, Config, IsModule, JsMinifyCommentOption,
};
use swc_core::base::config::{BuiltInput, Config, IsModule, JsMinifyCommentOption};
use swc_core::base::SwcComments;
use swc_core::common::comments::{Comment, CommentKind, Comments};
use swc_core::common::errors::{Handler, HANDLER};
Expand Down Expand Up @@ -121,7 +119,7 @@ impl SwcCompiler {

res
}

pub fn new(resource_path: PathBuf, source: String, mut options: Options) -> Result<Self, Error> {
let cm = Arc::new(SourceMap::new(FilePathMapping::empty()));
let globals = Globals::default();
Expand Down

0 comments on commit aecb435

Please sign in to comment.