Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply suggestions from rust-clippy #6256

Merged
merged 4 commits into from
Aug 29, 2021
Merged

Apply suggestions from rust-clippy #6256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04e6212
Unnecessary returns
mischnic Jun 4, 2021
611abf3
Redundant clones
mischnic Aug 29, 2021
4dc809a
Manual implementation of Option::map
mischnic Aug 29, 2021
601c3d0
Redundant pattern matching
mischnic Aug 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/transformers/js/core/src/decl_collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub fn collect_decls(module: &ast::Module) -> HashSet<(JsWord, SyntaxContext)> {
in_var: false,
};
module.visit_with(&ast::Invalid { span: DUMMY_SP } as _, &mut c);
return c.decls;
c.decls
}

struct DeclCollector {
Expand Down
69 changes: 23 additions & 46 deletions packages/transformers/js/core/src/dependency_collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ impl<'a> Fold for DependencyCollector<'a> {
self.config.source_type,
);

return node;
node
}

fn fold_named_export(&mut self, node: ast::NamedExport) -> ast::NamedExport {
Expand All @@ -293,7 +293,7 @@ impl<'a> Fold for DependencyCollector<'a> {
);
}

return node;
node
}

fn fold_export_all(&mut self, node: ast::ExportAll) -> ast::ExportAll {
Expand All @@ -306,7 +306,7 @@ impl<'a> Fold for DependencyCollector<'a> {
self.config.source_type,
);

return node;
node
}

fn fold_try_stmt(&mut self, node: ast::TryStmt) -> ast::TryStmt {
Expand All @@ -315,15 +315,8 @@ impl<'a> Fold for DependencyCollector<'a> {
let block = node.block.fold_with(self);
self.in_try = false;

let handler = match node.handler {
Some(handler) => Some(handler.fold_with(self)),
None => None,
};

let finalizer = match node.finalizer {
Some(finalizer) => Some(finalizer.fold_with(self)),
None => None,
};
let handler = node.handler.map(|handler| handler.fold_with(self));
let finalizer = node.finalizer.map(|finalizer| finalizer.fold_with(self));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL 😲


ast::TryStmt {
span: node.span,
Expand Down Expand Up @@ -411,23 +404,23 @@ impl<'a> Fold for DependencyCollector<'a> {
return node.fold_children_with(self);
}
"__parcel__require__" => {
let mut call = node.clone().fold_children_with(self);
let mut call = node.fold_children_with(self);
call.callee = ast::ExprOrSuper::Expr(Box::new(ast::Expr::Ident(ast::Ident::new(
"require".into(),
DUMMY_SP.apply_mark(self.ignore_mark),
))));
return call;
}
"__parcel__import__" => {
let mut call = node.clone().fold_children_with(self);
let mut call = node.fold_children_with(self);
call.callee = ast::ExprOrSuper::Expr(Box::new(ast::Expr::Ident(ast::Ident::new(
"import".into(),
DUMMY_SP.apply_mark(self.ignore_mark),
))));
return call;
}
"__parcel__importScripts__" => {
let mut call = node.clone().fold_children_with(self);
let mut call = node.fold_children_with(self);
call.callee = ast::ExprOrSuper::Expr(Box::new(ast::Expr::Ident(ast::Ident::new(
"importScripts".into(),
DUMMY_SP.apply_mark(self.ignore_mark),
Expand Down Expand Up @@ -457,7 +450,7 @@ impl<'a> Fold for DependencyCollector<'a> {
// Promise.resolve(require('foo'))
if match_member_expr(member, vec!["Promise", "resolve"], self.decls) {
if let Some(expr) = node.args.get(0) {
if let Some(_) = match_require(&*expr.expr, self.decls, Mark::fresh(Mark::root())) {
if match_require(&*expr.expr, self.decls, Mark::fresh(Mark::root())).is_some() {
self.in_promise = true;
let node = node.fold_children_with(self);
self.in_promise = was_in_promise;
Expand Down Expand Up @@ -488,7 +481,7 @@ impl<'a> Fold for DependencyCollector<'a> {
// => Promise.resolve().then(() => require('foo')).then(res => __importStar(res))
if let Some(require_node) = self.require_node.clone() {
self.require_node = None;
return build_promise_chain(node.clone(), require_node);
return build_promise_chain(node, require_node);
}
}
_ => {}
Expand Down Expand Up @@ -591,8 +584,7 @@ impl<'a> Fold for DependencyCollector<'a> {
return node;
};

node.args[0].expr =
Box::new(self.add_url_dependency(specifier.clone(), span, kind.clone(), source_type));
node.args[0].expr = Box::new(self.add_url_dependency(specifier, span, kind, source_type));

match opts {
Some(opts) => {
Expand Down Expand Up @@ -642,7 +634,7 @@ impl<'a> Fold for DependencyCollector<'a> {

// Replace import() with require()
if kind == DependencyKind::DynamicImport {
let mut call = node.clone();
let mut call = node;
if !self.config.scope_hoist {
let name = match &self.config.source_type {
SourceType::Module => "require",
Expand Down Expand Up @@ -766,12 +758,8 @@ impl<'a> Fold for DependencyCollector<'a> {
};

let (source_type, opts) = match_worker_type(args.get(1));
let placeholder = self.add_url_dependency(
specifier.clone(),
span,
DependencyKind::WebWorker,
source_type,
);
let placeholder =
self.add_url_dependency(specifier, span, DependencyKind::WebWorker, source_type);

// Replace argument with a require call to resolve the URL at runtime.
let mut node = node.clone();
Expand All @@ -797,7 +785,7 @@ impl<'a> Fold for DependencyCollector<'a> {
}
}

return node.fold_children_with(self);
node.fold_children_with(self)
}

fn fold_member_expr(&mut self, mut node: ast::MemberExpr) -> ast::MemberExpr {
Expand All @@ -824,7 +812,7 @@ impl<'a> Fold for DependencyCollector<'a> {

if let Some((specifier, span)) = self.match_new_url(&node, self.decls) {
let url = self.add_url_dependency(
specifier.clone(),
specifier,
span,
DependencyKind::URL,
self.config.source_type,
Expand Down Expand Up @@ -887,11 +875,7 @@ impl<'a> DependencyCollector<'a> {
if let Some(arg) = args.get(0) {
let (resolve, expr) = match &*arg.expr {
Fn(f) => {
let param = if let Some(param) = f.function.params.get(0) {
Some(&param.pat)
} else {
None
};
let param = f.function.params.get(0).map(|param| &param.pat);
let body = if let Some(body) = &f.function.body {
self.match_block_stmt_expr(body)
} else {
Expand Down Expand Up @@ -921,9 +905,7 @@ impl<'a> DependencyCollector<'a> {
if let ast::Expr::Ident(id) = &**callee {
if id.to_id() == resolve_id {
if let Some(arg) = call.args.get(0) {
if let Some(_) =
match_require(&*arg.expr, self.decls, Mark::fresh(Mark::root()))
{
if match_require(&*arg.expr, self.decls, Mark::fresh(Mark::root())).is_some() {
let was_in_promise = self.in_promise;
self.in_promise = true;
let node = node.fold_children_with(self);
Expand Down Expand Up @@ -1048,7 +1030,7 @@ fn build_promise_chain(node: ast::CallExpr, require_node: ast::CallExpr) -> ast:
}
}

return node;
node
}

fn create_url_constructor(url: ast::Expr, use_import_meta: bool) -> ast::Expr {
Expand Down Expand Up @@ -1113,7 +1095,7 @@ impl Fold for PromiseTransformer {
}
}

return swc_ecmascript::visit::fold_return_stmt(self, node);
swc_ecmascript::visit::fold_return_stmt(self, node)
}

fn fold_arrow_expr(&mut self, node: ast::ArrowExpr) -> ast::ArrowExpr {
Expand All @@ -1127,7 +1109,7 @@ impl Fold for PromiseTransformer {
}
}

return swc_ecmascript::visit::fold_arrow_expr(self, node);
swc_ecmascript::visit::fold_arrow_expr(self, node)
}

fn fold_expr(&mut self, node: ast::Expr) -> ast::Expr {
Expand All @@ -1143,7 +1125,7 @@ impl Fold for PromiseTransformer {
}
}

return node;
node
}
}

Expand Down Expand Up @@ -1434,10 +1416,5 @@ fn match_worker_type(expr: Option<&ast::ExprOrSpread>) -> (SourceType, Option<as
}
}

let expr = match expr {
None => None,
Some(e) => Some(e.clone()),
};

(SourceType::Script, expr)
(SourceType::Script, expr.cloned())
}
6 changes: 1 addition & 5 deletions packages/transformers/js/core/src/env_replacer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,7 @@ impl<'a> EnvReplacer<'a> {
span: DUMMY_SP,
name: *kv.value.clone().fold_with(self),
init: if let Some(key) = key {
if let Some(init) = self.replace(&key, false) {
Some(Box::new(init))
} else {
None
}
self.replace(&key, false).map(Box::new)
} else {
None
},
Expand Down
8 changes: 4 additions & 4 deletions packages/transformers/js/core/src/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ impl<'a> InlineFS<'a> {
match &member.obj {
ExprOrSuper::Expr(expr) => {
if let Some(source) = self.collect.match_require(expr) {
return Some((source.clone(), prop));
return Some((source, prop));
}

match &**expr {
Expand All @@ -123,7 +123,7 @@ impl<'a> InlineFS<'a> {
_ => {}
}

return None;
None
}

fn evaluate_fs_arg(
Expand Down Expand Up @@ -234,7 +234,7 @@ impl<'a> InlineFS<'a> {
Some(contents)
}
}
_ => return None,
_ => None,
}
}
}
Expand Down Expand Up @@ -332,7 +332,7 @@ impl<'a> Fold for Evaluator<'a> {
}
}

return node;
node
}
_ => node,
}
Expand Down
4 changes: 2 additions & 2 deletions packages/transformers/js/core/src/global_replacer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ impl<'a> Fold for GlobalReplacer<'a> {
_ => {}
}

return node;
node
}

fn fold_module(&mut self, node: ast::Module) -> ast::Module {
Expand All @@ -206,7 +206,7 @@ impl<'a> Fold for GlobalReplacer<'a> {
.values()
.map(|stmt| ast::ModuleItem::Stmt(stmt.clone())),
);
return node;
node
}
}

Expand Down
17 changes: 7 additions & 10 deletions packages/transformers/js/core/src/hoist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ impl<'a> Fold for Hoist<'a> {
.enumerate()
.map(|(i, expr)| {
if i != len - 1 {
if let Some(_) = match_require(&*expr, &self.collect.decls, self.collect.ignore_mark) {
if match_require(&*expr, &self.collect.decls, self.collect.ignore_mark).is_some() {
return Box::new(Expr::Unary(UnaryExpr {
op: UnaryOp::Bang,
arg: expr.fold_with(self),
Expand Down Expand Up @@ -919,7 +919,7 @@ impl<'a> Fold for Hoist<'a> {
} else {
PatOrExpr::Pat(Box::new(Pat::Expr(Box::new(Expr::Member(MemberExpr {
span: member.span,
obj: ExprOrSuper::Expr(Box::new(Expr::Ident(ident.id.clone()))),
obj: ExprOrSuper::Expr(Box::new(Expr::Ident(ident.id))),
prop: member.prop.clone().fold_with(self),
computed: member.computed,
})))))
Expand Down Expand Up @@ -1022,7 +1022,7 @@ impl<'a> Hoist<'a> {
self
.imported_symbols
.insert(new_name.clone(), (source.clone(), local.clone(), loc));
return Ident::new(new_name, span);
Ident::new(new_name, span)
}

fn get_require_ident(&self, local: &JsWord) -> Ident {
Expand All @@ -1046,7 +1046,7 @@ impl<'a> Hoist<'a> {

let mut span = span;
span.ctxt = SyntaxContext::empty();
return Ident::new(new_name, span);
Ident::new(new_name, span)
}

fn handle_non_const_require(&mut self, v: &VarDeclarator, source: &JsWord) {
Expand Down Expand Up @@ -1647,10 +1647,7 @@ impl Visit for Collect {
match node.args.get(0) {
Some(ExprOrSpread { expr, .. }) => {
let param = match &**expr {
Expr::Fn(func) => match func.function.params.get(0) {
Some(param) => Some(&param.pat),
None => None,
},
Expr::Fn(func) => func.function.params.get(0).map(|param| &param.pat),
Expr::Arrow(arrow) => arrow.params.get(0),
_ => None,
};
Expand Down Expand Up @@ -1942,14 +1939,14 @@ mod tests {
let mut emitter = swc_ecmascript::codegen::Emitter {
cfg: config,
comments: Some(&comments),
cm: source_map.clone(),
cm: source_map,
wr: writer,
};

emitter.emit_module(&program).unwrap();
}

return String::from_utf8(buf).unwrap();
String::from_utf8(buf).unwrap()
}

macro_rules! map(
Expand Down
7 changes: 4 additions & 3 deletions packages/transformers/js/core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,10 @@ pub fn transform(config: Config) -> Result<TransformResult, std::io::Error> {
let (buf, mut src_map_buf) =
emit(source_map.clone(), comments, &program, config.source_maps)?;
if config.source_maps {
if let Ok(_) = source_map
if source_map
.build_source_map(&mut src_map_buf)
.to_writer(&mut map_buf)
.is_ok()
{
result.map = Some(String::from_utf8(map_buf).unwrap());
}
Expand Down Expand Up @@ -496,12 +497,12 @@ fn emit(
let mut emitter = swc_ecmascript::codegen::Emitter {
cfg: config,
comments: Some(&comments),
cm: source_map.clone(),
cm: source_map,
wr: writer,
};

emitter.emit_module(&program)?;
}

return Ok((buf, src_map_buf));
Ok((buf, src_map_buf))
}
2 changes: 1 addition & 1 deletion packages/transformers/js/core/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub fn match_member_expr(
}
}

return false;
false
}

pub fn create_require(specifier: swc_atoms::JsWord) -> ast::CallExpr {
Expand Down
Loading