Enable automatic import merging by default

src/config/options.rs

@@ -640,7 +640,7 @@ config_option_with_style_edition_default!(
     // Imports
     ImportsIndent, IndentStyle, _ => IndentStyle::Block;
     ImportsLayout, ListTactic, _ => ListTactic::Mixed;
-    ImportsGranularityConfig, ImportGranularity, _ => ImportGranularity::Preserve;
+    ImportsGranularityConfig, ImportGranularity, _ => ImportGranularity::Crate;
     GroupImportsTacticConfig, GroupImportsTactic, _ => GroupImportsTactic::Preserve;
     MergeImports, bool, _ => false;
 

tests/source/imports/imports_granularity_default_crate.rs

@@ -0,0 +1,14 @@
+// Test that the default import granularity merges imports at crate level
+
+use std::collections::HashMap;
+use std::collections::BTreeMap;
+use std::collections::HashSet;
+use std::fs::File;
+use std::io::Read;
+use std::path::Path;
+
+pub use serde::Serialize;
+pub use serde::Deserialize;
+
+use clap::Args;
+use clap::Parser;

tests/target/cfg_if/detect/os/linux/auxvec.rs

@@ -190,8 +190,7 @@ mod tests {
     // using the auxv crate.
     #[cfg(feature = "std_detect_file_io")]
     fn auxv_crate_getprocfs(key: usize) -> Option<usize> {
-        use self::auxv_crate::procfs::search_procfs_auxv;
-        use self::auxv_crate::AuxvType;
+        use self::auxv_crate::{procfs::search_procfs_auxv, AuxvType};
         let k = key as AuxvType;
         match search_procfs_auxv(&[k]) {
             Ok(v) => Some(v[&k] as usize),
@@ -203,8 +202,7 @@ mod tests {
     // using the auxv crate.
     #[cfg(not(any(target_arch = "mips", target_arch = "mips64")))]
     fn auxv_crate_getauxval(key: usize) -> Option<usize> {
-        use self::auxv_crate::getauxval::Getauxval;
-        use self::auxv_crate::AuxvType;
+        use self::auxv_crate::{getauxval::Getauxval, AuxvType};
         let q = auxv_crate::getauxval::NativeGetauxval {};
         match q.getauxval(key as AuxvType) {
             Ok(v) => Some(v as usize),

tests/target/configs/group_imports/One-no_reorder.rs

@@ -1,12 +1,14 @@
 // rustfmt-group_imports: One
 // rustfmt-reorder_imports: false
 use chrono::Utc;
-use super::update::convert_publish_payload;
+use super::{
+    schema::{Context, Payload},
+    update::convert_publish_payload,
+};
 use juniper::{FieldError, FieldResult};
 use uuid::Uuid;
 use alloc::alloc::Layout;
 use std::sync::Arc;
 use broker::database::PooledConnection;
-use super::schema::{Context, Payload};
 use core::f32;
 use crate::models::Event;

tests/target/configs/group_imports/One.rs

@@ -1,6 +1,8 @@
 // rustfmt-group_imports: One
-use super::schema::{Context, Payload};
-use super::update::convert_publish_payload;
+use super::{
+    schema::{Context, Payload},
+    update::convert_publish_payload,
+};
 use crate::models::Event;
 use alloc::alloc::Layout;
 use broker::database::PooledConnection;

tests/target/configs/group_imports/StdExternalCrate-no_reorder.rs

@@ -10,6 +10,8 @@ use juniper::{FieldError, FieldResult};
 use uuid::Uuid;
 use broker::database::PooledConnection;
 
-use super::update::convert_publish_payload;
-use super::schema::{Context, Payload};
+use super::{
+    schema::{Context, Payload},
+    update::convert_publish_payload,
+};
 use crate::models::Event;

tests/target/configs/group_imports/StdExternalCrate.rs

@@ -8,6 +8,8 @@ use chrono::Utc;
 use juniper::{FieldError, FieldResult};
 use uuid::Uuid;
 
-use super::schema::{Context, Payload};
-use super::update::convert_publish_payload;
+use super::{
+    schema::{Context, Payload},
+    update::convert_publish_payload,
+};
 use crate::models::Event;

tests/target/imports/imports_granularity_default_crate.rs

@@ -0,0 +1,12 @@
+// Test that the default import granularity merges imports at crate level
+
+use std::{
+    collections::{BTreeMap, HashMap, HashSet},
+    fs::File,
+    io::Read,
+    path::Path,
+};
+
+pub use serde::{Deserialize, Serialize};
+
+use clap::{Args, Parser};

tests/target/imports_raw_identifiers/version_One.rs

@@ -1,5 +1,3 @@
 // rustfmt-version:One
 
-use websocket::client::ClientBuilder;
-use websocket::r#async::futures::Stream;
-use websocket::result::WebSocketError;
+use websocket::{client::ClientBuilder, r#async::futures::Stream, result::WebSocketError};

tests/target/imports_raw_identifiers/version_Two.rs

@@ -1,5 +1,3 @@
 // rustfmt-version:Two
 
-use websocket::r#async::futures::Stream;
-use websocket::client::ClientBuilder;
-use websocket::result::WebSocketError;
+use websocket::{r#async::futures::Stream, client::ClientBuilder, result::WebSocketError};

tests/target/issue-2896.rs

@@ -6,9 +6,7 @@ use rand::{Rng, SeedableRng, StdRng};
 
 use timely::dataflow::operators::*;
 
-use differential_dataflow::input::InputSession;
-use differential_dataflow::operators::*;
-use differential_dataflow::AsCollection;
+use differential_dataflow::{input::InputSession, operators::*, AsCollection};
 
 // mod loglikelihoodratio;
 

tests/target/postfix-yield.rs

@@ -3,8 +3,10 @@
 
 #![feature(gen_blocks, coroutines, coroutine_trait, yield_expr)]
 
-use std::ops::{Coroutine, CoroutineState};
-use std::pin::pin;
+use std::{
+    ops::{Coroutine, CoroutineState},
+    pin::pin,
+};
 
 fn main() {
     let mut coro = pin!(