Update rustfmt (#9669)

* added imports_granularity to rustfmt

* added group_imports

crates/json-comments-rs/src/lib.rs

@@ -41,10 +41,10 @@
 //! # }
 //! ```
 //!
-use std::{
- io::{ErrorKind, Read, Result},
- slice::IterMut,
-};
+use std::io::ErrorKind;
+use std::io::Read;
+use std::io::Result;
+use std::slice::IterMut;
 
 #[derive(Eq, PartialEq, Copy, Clone, Debug)]
 enum State {
@@ -389,8 +389,10 @@ fn in_line_comment(c: &mut u8) -> State {
 
 #[cfg(test)]
 mod tests {
+ use std::io::ErrorKind;
+ use std::io::Read;
+
  use super::*;
- use std::io::{ErrorKind, Read};
 
  fn strip_string(input: &str) -> String {
  let mut out = String::new();

crates/macros/src/lib.rs

@@ -1,14 +1,21 @@
-use indexmap::IndexMap;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
+use std::collections::HashSet;
 use std::sync::Arc;
 
+use indexmap::IndexMap;
 use swc_core::common::util::take::Take;
-use swc_core::common::{SourceMap, Span, DUMMY_SP};
+use swc_core::common::SourceMap;
+use swc_core::common::Span;
+use swc_core::common::DUMMY_SP;
 use swc_core::ecma::ast::*;
-use swc_core::ecma::atoms::{js_word, JsWord};
+use swc_core::ecma::atoms::js_word;
+use swc_core::ecma::atoms::JsWord;
+use swc_core::ecma::parser::error::Error;
 use swc_core::ecma::parser::lexer::Lexer;
-use swc_core::ecma::parser::{error::Error, Parser, StringInput};
-use swc_core::ecma::visit::{Fold, FoldWith};
+use swc_core::ecma::parser::Parser;
+use swc_core::ecma::parser::StringInput;
+use swc_core::ecma::visit::Fold;
+use swc_core::ecma::visit::FoldWith;
 
 #[cfg(feature = "napi")]
 pub mod napi;

crates/macros/src/napi.rs

@@ -1,15 +1,26 @@
 use std::sync::Arc;
 
-use crate::{JsValue, Location, MacroCallback, MacroError};
-use crossbeam_channel::{Receiver, Sender};
+use crossbeam_channel::Receiver;
+use crossbeam_channel::Sender;
 use indexmap::IndexMap;
-use napi::{
- threadsafe_function::{ThreadSafeCallContext, ThreadsafeFunctionCallMode},
- Env, JsBoolean, JsFunction, JsNumber, JsObject, JsString, JsUnknown, ValueType,
-};
+use napi::threadsafe_function::ThreadSafeCallContext;
+use napi::threadsafe_function::ThreadsafeFunctionCallMode;
+use napi::Env;
+use napi::JsBoolean;
+use napi::JsFunction;
+use napi::JsNumber;
+use napi::JsObject;
+use napi::JsString;
+use napi::JsUnknown;
+use napi::ValueType;
 use napi_derive::napi;
 use swc_core::common::DUMMY_SP;
 
+use crate::JsValue;
+use crate::Location;
+use crate::MacroCallback;
+use crate::MacroError;
+
 struct CallMacroMessage {
  src: String,
  export: String,

crates/node-bindings/src/fs_search.rs

@@ -1,6 +1,7 @@
-use napi_derive::napi;
 use std::path::Path;
 
+use napi_derive::napi;
+
 #[napi]
 pub fn find_ancestor_file(filenames: Vec<String>, from: String, root: String) -> Option<String> {
  let from = Path::new(&from);

crates/node-bindings/src/hash.rs

@@ -1,9 +1,11 @@
 #![allow(clippy::new_without_default)]
 
+use std::hash::Hasher;
+
 use napi::bindgen_prelude::Buffer;
 use napi_derive::napi;
-use std::hash::Hasher;
-use xxhash_rust::xxh3::{xxh3_64, Xxh3};
+use xxhash_rust::xxh3::xxh3_64;
+use xxhash_rust::xxh3::Xxh3;
 
 #[napi]
 pub fn hash_string(s: String) -> String {

crates/node-bindings/src/image.rs

@@ -1,12 +1,18 @@
-use mozjpeg_sys::*;
-use napi::bindgen_prelude::*;
-use napi::{Env, Error, JsBuffer, Result};
-use napi_derive::napi;
-use oxipng::{optimize_from_memory, Headers, Options};
 use std::mem;
 use std::ptr;
 use std::slice;
 
+use mozjpeg_sys::*;
+use napi::bindgen_prelude::*;
+use napi::Env;
+use napi::Error;
+use napi::JsBuffer;
+use napi::Result;
+use napi_derive::napi;
+use oxipng::optimize_from_memory;
+use oxipng::Headers;
+use oxipng::Options;
+
 #[napi]
 pub fn optimize_image(kind: String, buf: Buffer, env: Env) -> Result<JsBuffer> {
  let slice = buf.as_ref();

crates/node-bindings/src/init_sentry/sentry.rs

@@ -1,16 +1,17 @@
+use std::collections::HashMap;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::time::Duration;
+
 use napi::Error;
 use napi::Result;
 use napi::Status;
 use napi_derive::napi;
 use once_cell::sync::Lazy;
 use sentry::configure_scope;
-use sentry::{init, ClientInitGuard};
+use sentry::init;
+use sentry::ClientInitGuard;
 use serde_json::Value;
-use std::collections::HashMap;
-use std::{
- sync::{Arc, Mutex},
- time::Duration,
-};
 use whoami::username;
 
 static SENTRY_GUARD: Lazy<Arc<Mutex<Option<ClientInitGuard>>>> =

crates/node-bindings/src/lib.rs

@@ -3,7 +3,9 @@
 mod init_sentry;
 
 #[cfg(target_arch = "wasm32")]
-use std::alloc::{alloc, Layout};
+use std::alloc::alloc;
+#[cfg(target_arch = "wasm32")]
+use std::alloc::Layout;
 
 #[cfg(target_os = "macos")]
 #[global_allocator]

crates/node-bindings/src/resolver.rs

@@ -1,24 +1,37 @@
-use dashmap::DashMap;
-use napi::{
- bindgen_prelude::Either3, Env, JsBoolean, JsBuffer, JsFunction, JsObject, JsString, JsUnknown,
- Ref, Result,
-};
-use napi_derive::napi;
+use std::borrow::Cow;
+use std::collections::HashMap;
+use std::path::Path;
+use std::path::PathBuf;
 #[cfg(not(target_arch = "wasm32"))]
 use std::sync::atomic::Ordering;
-use std::{
- borrow::Cow,
- collections::HashMap,
- path::{Path, PathBuf},
- sync::Arc,
-};
+use std::sync::Arc;
 
+use dashmap::DashMap;
+use napi::bindgen_prelude::Either3;
+use napi::Env;
+use napi::JsBoolean;
+use napi::JsBuffer;
+use napi::JsFunction;
+use napi::JsObject;
+use napi::JsString;
+use napi::JsUnknown;
+use napi::Ref;
+use napi::Result;
+use napi_derive::napi;
+use parcel_resolver::ExportsCondition;
+use parcel_resolver::Extensions;
+use parcel_resolver::Fields;
+use parcel_resolver::FileCreateInvalidation;
+use parcel_resolver::FileSystem;
+use parcel_resolver::Flags;
+use parcel_resolver::IncludeNodeModules;
+use parcel_resolver::Invalidations;
+use parcel_resolver::ModuleType;
 #[cfg(not(target_arch = "wasm32"))]
 use parcel_resolver::OsFileSystem;
-use parcel_resolver::{
- ExportsCondition, Extensions, Fields, FileCreateInvalidation, FileSystem, Flags,
- IncludeNodeModules, Invalidations, ModuleType, Resolution, ResolverError, SpecifierType,
-};
+use parcel_resolver::Resolution;
+use parcel_resolver::ResolverError;
+use parcel_resolver::SpecifierType;
 
 type NapiSideEffectsVariants = Either3<bool, Vec<String>, HashMap<String, bool>>;
 

crates/node-bindings/src/transformer.rs

@@ -1,4 +1,6 @@
-use napi::{Env, JsObject, JsUnknown};
+use napi::Env;
+use napi::JsObject;
+use napi::JsUnknown;
 use napi_derive::napi;
 
 #[napi]
@@ -11,9 +13,10 @@ pub fn transform(opts: JsObject, env: Env) -> napi::Result<JsUnknown> {
 
 #[cfg(not(target_arch = "wasm32"))]
 mod native_only {
- use super::*;
  use parcel_macros::napi::create_macro_callback;
 
+ use super::*;
+
  #[napi]
  pub fn transform_async(opts: JsObject, env: Env) -> napi::Result<JsObject> {
  let call_macro = if opts.has_named_property("callMacro")? {

package.json

@@ -21,7 +21,7 @@
  "build-repl": "yarn build-native-release && yarn build-native-wasm && yarn workspace @parcel/repl build",
  "clean-test": "rimraf packages/core/integration-tests/.parcel-cache && rimraf packages/core/integration-tests/dist",
  "clean": "yarn clean-test && lerna clean --yes && lerna exec -- rimraf ./lib && yarn",
- "format": "prettier --write \"./packages/*/*/{src,bin,test}/**/*.{js,json,md}\" && cargo fmt --all",
+ "format": "prettier --write \"./packages/*/*/{src,bin,test}/**/*.{js,json,md}\" && cargo +nightly fmt --all",
  "link-all": "node scripts/link-all.js packages",
  "unlink-all": "node scripts/unlink-all.js packages",
  "check": "flow check",

packages/transformers/js/core/src/collect.rs

@@ -1,14 +1,29 @@
-use crate::id;
-use crate::utils::{
- is_unresolved, match_export_name, match_export_name_ident, match_import, match_member_expr,
- match_property_name, match_require, Bailout, BailoutReason, SourceLocation,
-};
-use serde::{Deserialize, Serialize};
-use std::collections::{HashMap, HashSet};
-use swc_core::common::{sync::Lrc, Mark, Span, DUMMY_SP};
+use std::collections::HashMap;
+use std::collections::HashSet;
+
+use serde::Deserialize;
+use serde::Serialize;
+use swc_core::common::sync::Lrc;
+use swc_core::common::Mark;
+use swc_core::common::Span;
+use swc_core::common::DUMMY_SP;
 use swc_core::ecma::ast::*;
-use swc_core::ecma::atoms::{js_word, JsWord};
-use swc_core::ecma::visit::{Visit, VisitWith};
+use swc_core::ecma::atoms::js_word;
+use swc_core::ecma::atoms::JsWord;
+use swc_core::ecma::visit::Visit;
+use swc_core::ecma::visit::VisitWith;
+
+use crate::id;
+use crate::utils::is_unresolved;
+use crate::utils::match_export_name;
+use crate::utils::match_export_name_ident;
+use crate::utils::match_import;
+use crate::utils::match_member_expr;
+use crate::utils::match_property_name;
+use crate::utils::match_require;
+use crate::utils::Bailout;
+use crate::utils::BailoutReason;
+use crate::utils::SourceLocation;
 
 macro_rules! collect_visit_fn {
  ($name:ident, $type:ident) => {

packages/transformers/js/core/src/constant_module.rs

@@ -1,8 +1,14 @@
 use std::collections::HashSet;
 
-use swc_core::ecma::ast::{
- Decl, Expr, Lit, Module, ModuleDecl, ModuleItem, Stmt, VarDeclKind, VarDeclarator,
-};
+use swc_core::ecma::ast::Decl;
+use swc_core::ecma::ast::Expr;
+use swc_core::ecma::ast::Lit;
+use swc_core::ecma::ast::Module;
+use swc_core::ecma::ast::ModuleDecl;
+use swc_core::ecma::ast::ModuleItem;
+use swc_core::ecma::ast::Stmt;
+use swc_core::ecma::ast::VarDeclKind;
+use swc_core::ecma::ast::VarDeclarator;
 use swc_core::ecma::atoms::JsWord;
 use swc_core::ecma::visit::Visit;
 
@@ -128,12 +134,17 @@ impl Visit for ConstantModule {
 
 #[cfg(test)]
 mod tests {
- use super::*;
  use swc_core::common::comments::SingleThreadedComments;
- use swc_core::common::{sync::Lrc, FileName, Globals, SourceMap};
+ use swc_core::common::sync::Lrc;
+ use swc_core::common::FileName;
+ use swc_core::common::Globals;
+ use swc_core::common::SourceMap;
  use swc_core::ecma::parser::lexer::Lexer;
- use swc_core::ecma::parser::{Parser, StringInput};
+ use swc_core::ecma::parser::Parser;
+ use swc_core::ecma::parser::StringInput;
  use swc_core::ecma::visit::VisitWith;
+
+ use super::*;
  extern crate indoc;
 
  fn is_constant_module(code: &str) -> bool {

packages/transformers/js/core/src/dependency_collector.rs

@@ -1,20 +1,28 @@
-use path_slash::PathBufExt;
+use std::collections::hash_map::DefaultHasher;
 use std::collections::HashMap;
 use std::fmt;
+use std::hash::Hash;
+use std::hash::Hasher;
 use std::path::Path;
 
-use serde::{Deserialize, Serialize};
-use swc_core::common::{Mark, SourceMap, Span, DUMMY_SP};
-use swc_core::ecma::ast::{self, Callee, MemberProp};
-use swc_core::ecma::atoms::{js_word, JsWord};
-use swc_core::ecma::visit::{Fold, FoldWith};
+use path_slash::PathBufExt;
+use serde::Deserialize;
+use serde::Serialize;
+use swc_core::common::Mark;
+use swc_core::common::SourceMap;
+use swc_core::common::Span;
+use swc_core::common::DUMMY_SP;
+use swc_core::ecma::ast::Callee;
+use swc_core::ecma::ast::MemberProp;
+use swc_core::ecma::ast::{self};
+use swc_core::ecma::atoms::js_word;
+use swc_core::ecma::atoms::JsWord;
+use swc_core::ecma::visit::Fold;
+use swc_core::ecma::visit::FoldWith;
 
 use crate::fold_member_expr_skip_prop;
 use crate::utils::*;
 use crate::Config;
-
-use std::collections::hash_map::DefaultHasher;
-use std::hash::{Hash, Hasher};
 macro_rules! hash {
  ($str:expr) => {{
  let mut hasher = DefaultHasher::new();
@@ -357,7 +365,8 @@ impl<'a> Fold for DependencyCollector<'a> {
  }
 
  fn fold_call_expr(&mut self, node: ast::CallExpr) -> ast::CallExpr {
- use ast::{Expr::*, Ident};
+ use ast::Expr::*;
+ use ast::Ident;
 
  let kind = match &node.callee {
  Callee::Import(_) => DependencyKind::DynamicImport,