Add group_imports: One setting and make filenames more consistent

tests/source/imports/imports_granularity_module_no_reorder.rs → tests/source/imports/imports_granularity_module-One-no_reorder.rs

@@ -1,4 +1,5 @@
 // rustfmt-imports_granularity: Module
+// rustfmt-group_imports: One
 // rustfmt-reorder_imports: false
 
 use a::{b::c, d::e};

tests/source/imports/imports_granularity_module_condensed_no_reorder.rs → tests/source/imports/imports_granularity_module_condensed-One-no_reorder.rs

@@ -1,4 +1,5 @@
 // rustfmt-imports_granularity: ModuleCondensed
+// rustfmt-group_imports: One
 // rustfmt-reorder_imports: false
 
 use a::{b::c, d::e};

tests/target/imports/imports_granularity_module_no_reorder.rs → tests/target/imports/imports_granularity_module-One-no_reorder.rs

@@ -1,44 +1,37 @@
 // rustfmt-imports_granularity: Module
+// rustfmt-group_imports: One
 // rustfmt-reorder_imports: false
 
-use a::{b::c, d::e};
-use a::{
-    f,
-    g::{h, i},
-};
-use a::{
-    j::{
-        self,
-        k::{self, l},
-        m,
-    },
-    n::{o::p, q},
-};
-pub use a::{r::s, t};
-use b::{c::d, self};
-
+use a::b::c;
+use a::d::e;
+use a::f;
+use a::g::{h, i};
+use a::j::{self, m};
+use a::j::k::{self, l};
+use a::n::o::p;
+use a::n::q;
+pub use a::r::s;
+pub use a::t;
+use b::{self, c, d, e};
+use b::c::d;
 #[cfg(test)]
 use foo::{a::b, c::d};
 use foo::e;
-
 use bar::{
     // comment
     a::b,
     // more comment
     c::d,
     e::f,
 };
-
 use b::{
     f::g,
     h::{i, j}, /* After b::h group */
 };
-use b::e;
 use b::{
     /* Before b::l group */ l::{self, m, n::o, p::*},
     q,
 };
-use b::d;
 use b::r; // After b::r
 use b::q::{self /* After b::q::self */};
 use b::u::{a, b};
@@ -58,4 +51,3 @@ use b::v::{
     b,
 };
 use b::t::{/* Before b::t::self */ self};
-use b::c;

tests/target/imports/imports_granularity_module_condensed_no_reorder.rs → tests/target/imports/imports_granularity_module_condensed-One-no_reorder.rs

@@ -1,44 +1,32 @@
 // rustfmt-imports_granularity: ModuleCondensed
+// rustfmt-group_imports: One
 // rustfmt-reorder_imports: false
 
-use a::{b::c, d::e};
-use a::{
-    f,
-    g::{h, i},
-};
-use a::{
-    j::{
-        self,
-        k::{self, l},
-        m,
-    },
-    n::{o::p, q},
-};
+use a::{b::c, d::e, f};
+use a::g::{h, i};
+use a::j::{self, m};
+use a::j::k::{self, l};
+use a::n::{o::p, q};
 pub use a::{r::s, t};
-use b::{c::d, self};
-
+use b::{self, c, c::d, d, e};
 #[cfg(test)]
 use foo::{a::b, c::d};
 use foo::e;
-
 use bar::{
     // comment
     a::b,
     // more comment
     c::d,
     e::f,
 };
-
 use b::{
     f::g,
     h::{i, j}, /* After b::h group */
 };
-use b::e;
 use b::{
     /* Before b::l group */ l::{self, m, n::o, p::*},
     q,
 };
-use b::d;
 use b::r; // After b::r
 use b::q::{self /* After b::q::self */};
 use b::u::{a, b};
@@ -58,4 +46,3 @@ use b::v::{
     b,
 };
 use b::t::{/* Before b::t::self */ self};
-use b::c;