Various things

parcel-bundler · Jun 4, 2021 · a72bc3b · a72bc3b
1 parent 134c731
commit a72bc3b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/packages/transformers/js/core/src/dependency_collector.rs b/packages/transformers/js/core/src/dependency_collector.rs
@@ -18,7 +18,7 @@ pub enum DependencyKind {
   WebWorker,
   ServiceWorker,
   ImportScripts,
-  URL,
+  Url,
   File,
 }
 
@@ -465,7 +465,7 @@ impl<'a> Fold for DependencyCollector<'a> {
 
   fn fold_expr(&mut self, node: ast::Expr) -> ast::Expr {
     if let Some((specifier, span)) = match_import_meta_url(&node, self.decls) {
-      self.add_dependency(specifier.clone(), span, DependencyKind::URL, None, false);
+      self.add_dependency(specifier.clone(), span, DependencyKind::Url, None, false);
 
       return ast::Expr::Call(create_require(specifier));
     }

diff --git a/packages/transformers/js/core/src/hoist.rs b/packages/transformers/js/core/src/hoist.rs
@@ -1241,7 +1241,7 @@ impl Visit for Collect {
           self
             .exports
             .entry(id!(namespace.name))
-            .or_insert("*".into());
+            .or_insert_with(|| "*".into());
         }
       }
     }
@@ -1732,10 +1732,8 @@ impl Collect {
         }
       }
       Pat::Array(array) => {
-        for el in &array.elems {
-          if let Some(el) = el {
-            self.get_non_const_binding_idents(&el, idents);
-          }
+        for el in array.elems.iter().flatten() {
+          self.get_non_const_binding_idents(&el, idents);
         }
       }
       _ => {}
@@ -1744,7 +1742,7 @@ impl Collect {
 }
 
 fn is_marked(span: Span, mark: Mark) -> bool {
-  let mut ctxt = span.ctxt().clone();
+  let mut ctxt = span.ctxt();
 
   loop {
     let m = ctxt.remove_mark();
@@ -1836,11 +1834,9 @@ fn has_binding_identifier(node: &Pat, sym: &JsWord, decls: &HashSet<IdentId>) ->
       }
     }
     Pat::Array(array) => {
-      for el in &array.elems {
-        if let Some(el) = el {
-          if has_binding_identifier(&el, sym, decls) {
-            return true;
-          }
+      for el in array.elems.iter().flatten() {
+        if has_binding_identifier(&el, sym, decls) {
+          return true;
         }
       }
     }

diff --git a/packages/transformers/js/core/src/lib.rs b/packages/transformers/js/core/src/lib.rs
@@ -392,12 +392,14 @@ fn parse(
   }
 }
 
+type EmitResult = (Vec<u8>, Vec<(swc_common::BytePos, swc_common::LineCol)>);
+
 fn emit(
   source_map: Lrc<SourceMap>,
   comments: SingleThreadedComments,
   program: &Module,
   source_maps: bool,
-) -> Result<(Vec<u8>, Vec<(swc_common::BytePos, swc_common::LineCol)>), std::io::Error> {
+) -> Result<EmitResult, std::io::Error> {
   let mut src_map_buf = vec![];
   let mut buf = vec![];
   {

diff --git a/packages/transformers/js/src/JSTransformer.js b/packages/transformers/js/src/JSTransformer.js
@@ -330,7 +330,7 @@ export default (new Transformer({
             loc: convertLoc(dep.loc),
           });
         }
-      } else if (dep.kind === 'URL') {
+      } else if (dep.kind === 'Url') {
         asset.addURLDependency(dep.specifier, {
           loc: convertLoc(dep.loc),
         });