Skip to content

Commit 7734d29

Browse files
nrcnrc
authored
Merge pull request #2662 from csmoe/imports_indent
Change the default value of imports_indent to IndentStyle::Block
2 parents 1b71956 + e554d86 commit 7734d29

17 files changed

+176
-114
lines changed

Diff for: ‎Configurations.md

+26-18
Original file line numberDiff line numberDiff line change
@@ -1042,8 +1042,10 @@ Item layout inside a imports block
10421042
```rust
10431043
use foo::{xxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzzzz};
10441044

1045-
use foo::{aaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbb, cccccccccccccccccc, dddddddddddddddddd,
1046-
eeeeeeeeeeeeeeeeee, ffffffffffffffffff};
1045+
use foo::{
1046+
aaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbb, cccccccccccccccccc, dddddddddddddddddd,
1047+
eeeeeeeeeeeeeeeeee, ffffffffffffffffff,
1048+
};
10471049
```
10481050

10491051
#### `"Horizontal"`:
@@ -1061,27 +1063,33 @@ use foo::{aaa, bbb, ccc, ddd, eee, fff};
10611063
```rust
10621064
use foo::{xxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzzzz};
10631065

1064-
use foo::{aaaaaaaaaaaaaaaaaa,
1065-
bbbbbbbbbbbbbbbbbb,
1066-
cccccccccccccccccc,
1067-
dddddddddddddddddd,
1068-
eeeeeeeeeeeeeeeeee,
1069-
ffffffffffffffffff};
1066+
use foo::{
1067+
aaaaaaaaaaaaaaaaaa,
1068+
bbbbbbbbbbbbbbbbbb,
1069+
cccccccccccccccccc,
1070+
dddddddddddddddddd,
1071+
eeeeeeeeeeeeeeeeee,
1072+
ffffffffffffffffff,
1073+
};
10701074
```
10711075

10721076
#### `"Vertical"`:
10731077

10741078
```rust
1075-
use foo::{xxx,
1076-
yyy,
1077-
zzz};
1079+
use foo::{
1080+
xxx,
1081+
yyy,
1082+
zzz,
1083+
};
10781084

1079-
use foo::{aaa,
1080-
bbb,
1081-
ccc,
1082-
ddd,
1083-
eee,
1084-
fff};
1085+
use foo::{
1086+
aaa,
1087+
bbb,
1088+
ccc,
1089+
ddd,
1090+
eee,
1091+
fff,
1092+
};
10851093
```
10861094

10871095
## `merge_imports`
@@ -2036,7 +2044,7 @@ fn foo() {
20362044

20372045
## `required_version`
20382046

2039-
Require a specific version of rustfmt. If you want to make sure that the
2047+
Require a specific version of rustfmt. If you want to make sure that the
20402048
specific version of rustfmt is used in your CI, use this option.
20412049

20422050
- **Default value**: `CARGO_PKG_VERSION`

Diff for: ‎src/bin/main.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ use failure::err_msg;
2424

2525
use getopts::{Matches, Options};
2626

27-
use rustfmt::{emit_post_matter, emit_pre_matter, load_config, CliOptions, Config, FmtResult,
28-
WriteMode, WRITE_MODE_LIST};
27+
use rustfmt::{
28+
emit_post_matter, emit_pre_matter, load_config, CliOptions, Config, FmtResult, WriteMode,
29+
WRITE_MODE_LIST,
30+
};
2931
use rustfmt::{format_and_emit_report, FileName, Input, Summary};
3032

3133
fn main() {

Diff for: ‎src/chains.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ use expr::rewrite_call;
7070
use macros::convert_try_mac;
7171
use rewrite::{Rewrite, RewriteContext};
7272
use shape::Shape;
73-
use utils::{first_line_width, last_line_extendable, last_line_width, mk_sp,
74-
trimmed_last_line_width, wrap_str};
73+
use utils::{
74+
first_line_width, last_line_extendable, last_line_width, mk_sp, trimmed_last_line_width,
75+
wrap_str,
76+
};
7577

7678
use std::borrow::Cow;
7779
use std::cmp::min;

Diff for: ‎src/config/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ create_config! {
6262
where_single_line: bool, false, false, "Force where clauses to be on a single line";
6363

6464
// Imports
65-
imports_indent: IndentStyle, IndentStyle::Visual, false, "Indent of imports";
65+
imports_indent: IndentStyle, IndentStyle::Block, false, "Indent of imports";
6666
imports_layout: ListTactic, ListTactic::Mixed, false, "Item layout inside a import block";
6767
merge_imports: bool, false, false, "Merge imports";
6868

Diff for: ‎src/expr.rs

+13-7
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@ use syntax::{ast, ptr};
1919
use chains::rewrite_chain;
2020
use closures;
2121
use codemap::{LineRangeUtils, SpanUtils};
22-
use comment::{combine_strs_with_missing_comments, contains_comment, recover_comment_removed,
23-
rewrite_comment, rewrite_missing_comment, CharClasses, FindUncommented};
22+
use comment::{
23+
combine_strs_with_missing_comments, contains_comment, recover_comment_removed, rewrite_comment,
24+
rewrite_missing_comment, CharClasses, FindUncommented,
25+
};
2426
use config::{Config, ControlBraceStyle, IndentStyle};
25-
use lists::{definitive_tactic, itemize_list, shape_for_tactic, struct_lit_formatting,
26-
struct_lit_shape, struct_lit_tactic, write_list, ListFormatting, ListItem, Separator};
27+
use lists::{
28+
definitive_tactic, itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape,
29+
struct_lit_tactic, write_list, ListFormatting, ListItem, Separator,
30+
};
2731
use macros::{rewrite_macro, MacroArg, MacroPosition};
2832
use matches::rewrite_match;
2933
use overflow;
@@ -33,9 +37,11 @@ use shape::{Indent, Shape};
3337
use spanned::Spanned;
3438
use string::{rewrite_string, StringFormat};
3539
use types::{can_be_overflowed_type, rewrite_path, PathContext};
36-
use utils::{colon_spaces, contains_skip, count_newlines, first_line_width, inner_attributes,
37-
last_line_extendable, last_line_width, mk_sp, outer_attributes, paren_overhead,
38-
ptr_vec_to_ref_vec, semicolon_for_stmt, wrap_str};
40+
use utils::{
41+
colon_spaces, contains_skip, count_newlines, first_line_width, inner_attributes,
42+
last_line_extendable, last_line_width, mk_sp, outer_attributes, paren_overhead,
43+
ptr_vec_to_ref_vec, semicolon_for_stmt, wrap_str,
44+
};
3945
use vertical::rewrite_with_alignment;
4046
use visitor::FmtVisitor;
4147

Diff for: ‎src/items.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@ use syntax::visit;
2121
use syntax::{ast, ptr, symbol};
2222

2323
use codemap::{LineRangeUtils, SpanUtils};
24-
use comment::{combine_strs_with_missing_comments, contains_comment, recover_comment_removed,
25-
recover_missing_comment_in_span, rewrite_missing_comment, FindUncommented};
24+
use comment::{
25+
combine_strs_with_missing_comments, contains_comment, recover_comment_removed,
26+
recover_missing_comment_in_span, rewrite_missing_comment, FindUncommented,
27+
};
2628
use config::{BraceStyle, Config, Density, IndentStyle};
27-
use expr::{format_expr, is_empty_block, is_simple_block_stmt, rewrite_assign_rhs,
28-
rewrite_assign_rhs_with, ExprType, RhsTactics};
29+
use expr::{
30+
format_expr, is_empty_block, is_simple_block_stmt, rewrite_assign_rhs, rewrite_assign_rhs_with,
31+
ExprType, RhsTactics,
32+
};
2933
use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator};
3034
use macros::{rewrite_macro, MacroPosition};
3135
use overflow;

Diff for: ‎src/macros.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ use syntax::util::ThinVec;
3333
use syntax::{ast, ptr};
3434

3535
use codemap::SpanUtils;
36-
use comment::{contains_comment, remove_trailing_white_spaces, CharClasses, FindUncommented,
37-
FullCodeCharKind, LineClasses};
36+
use comment::{
37+
contains_comment, remove_trailing_white_spaces, CharClasses, FindUncommented, FullCodeCharKind,
38+
LineClasses,
39+
};
3840
use expr::rewrite_array;
3941
use lists::{itemize_list, write_list, ListFormatting};
4042
use overflow;

Diff for: ‎src/matches.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,18 @@ use syntax::{ast, ptr};
1919
use codemap::SpanUtils;
2020
use comment::combine_strs_with_missing_comments;
2121
use config::{Config, ControlBraceStyle, IndentStyle};
22-
use expr::{format_expr, is_empty_block, is_simple_block, is_unsafe_block, prefer_next_line,
23-
rewrite_multiple_patterns, ExprType, RhsTactics, ToExpr};
22+
use expr::{
23+
format_expr, is_empty_block, is_simple_block, is_unsafe_block, prefer_next_line,
24+
rewrite_multiple_patterns, ExprType, RhsTactics, ToExpr,
25+
};
2426
use lists::{itemize_list, write_list, ListFormatting};
2527
use rewrite::{Rewrite, RewriteContext};
2628
use shape::Shape;
2729
use spanned::Spanned;
28-
use utils::{contains_skip, extra_offset, first_line_width, inner_attributes, last_line_extendable,
29-
mk_sp, ptr_vec_to_ref_vec, trimmed_last_line_width};
30+
use utils::{
31+
contains_skip, extra_offset, first_line_width, inner_attributes, last_line_extendable, mk_sp,
32+
ptr_vec_to_ref_vec, trimmed_last_line_width,
33+
};
3034

3135
/// A simple wrapper type against `ast::Arm`. Used inside `write_list()`.
3236
struct ArmWrapper<'a> {

Diff for: ‎src/overflow.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListIte
2323
use rewrite::{Rewrite, RewriteContext};
2424
use shape::Shape;
2525
use spanned::Spanned;
26-
use utils::{count_newlines, extra_offset, first_line_width, last_line_width, mk_sp, paren_overhead};
26+
use utils::{
27+
count_newlines, extra_offset, first_line_width, last_line_width, mk_sp, paren_overhead,
28+
};
2729

2830
use std::cmp::min;
2931

Diff for: ‎src/patterns.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ use syntax::ptr;
1515

1616
use codemap::SpanUtils;
1717
use comment::FindUncommented;
18-
use expr::{can_be_overflowed_expr, rewrite_pair, rewrite_unary_prefix, wrap_struct_field,
19-
PairParts};
20-
use lists::{itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape,
21-
struct_lit_tactic, write_list};
18+
use expr::{
19+
can_be_overflowed_expr, rewrite_pair, rewrite_unary_prefix, wrap_struct_field, PairParts,
20+
};
21+
use lists::{
22+
itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape, struct_lit_tactic,
23+
write_list,
24+
};
2225
use macros::{rewrite_macro, MacroPosition};
2326
use overflow;
2427
use rewrite::{Rewrite, RewriteContext};

Diff for: ‎src/types.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@ use syntax::symbol::keywords;
1818

1919
use codemap::SpanUtils;
2020
use config::{IndentStyle, TypeDensity};
21-
use expr::{rewrite_assign_rhs, rewrite_pair, rewrite_tuple, rewrite_unary_prefix, PairParts,
22-
ToExpr};
21+
use expr::{
22+
rewrite_assign_rhs, rewrite_pair, rewrite_tuple, rewrite_unary_prefix, PairParts, ToExpr,
23+
};
2324
use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, Separator};
2425
use macros::{rewrite_macro, MacroPosition};
2526
use overflow;
2627
use rewrite::{Rewrite, RewriteContext};
2728
use shape::Shape;
2829
use spanned::Spanned;
29-
use utils::{colon_spaces, extra_offset, first_line_width, format_abi, format_mutability,
30-
last_line_width, mk_sp};
30+
use utils::{
31+
colon_spaces, extra_offset, first_line_width, format_abi, format_mutability, last_line_width,
32+
mk_sp,
33+
};
3134

3235
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
3336
pub enum PathContext {

Diff for: ‎src/utils.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
use std::borrow::Cow;
1212

1313
use rustc_target::spec::abi;
14-
use syntax::ast::{self, Attribute, CrateSugar, MetaItem, MetaItemKind, NestedMetaItem,
15-
NestedMetaItemKind, Path, Visibility, VisibilityKind};
14+
use syntax::ast::{
15+
self, Attribute, CrateSugar, MetaItem, MetaItemKind, NestedMetaItem, NestedMetaItemKind, Path,
16+
Visibility, VisibilityKind,
17+
};
1618
use syntax::codemap::{BytePos, Span, NO_EXPANSION};
1719
use syntax::ptr;
1820

Diff for: ‎src/visitor.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ use attr::*;
1717
use codemap::{LineRangeUtils, SpanUtils};
1818
use comment::{CodeCharKind, CommentCodeSlices, FindUncommented};
1919
use config::{BraceStyle, Config};
20-
use items::{format_impl, format_trait, format_trait_alias, is_mod_decl, is_use_item,
21-
rewrite_associated_impl_type, rewrite_associated_type, rewrite_extern_crate,
22-
rewrite_type_alias, FnSig, StaticParts, StructParts};
20+
use items::{
21+
format_impl, format_trait, format_trait_alias, is_mod_decl, is_use_item,
22+
rewrite_associated_impl_type, rewrite_associated_type, rewrite_extern_crate,
23+
rewrite_type_alias, FnSig, StaticParts, StructParts,
24+
};
2325
use macros::{rewrite_macro, rewrite_macro_def, MacroPosition};
2426
use rewrite::{Rewrite, RewriteContext};
2527
use shape::{Indent, Shape};

Diff for: ‎tests/target/import-fencepost-length.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
use aaaaaaaaaaaaaaa::bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;
2-
use aaaaaaaaaaaaaaa::{bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccccccccccc, dddddddd};
3-
use aaaaaaaaaaaaaaa::{bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccccccccccc,
4-
ddddddddd};
2+
use aaaaaaaaaaaaaaa::{
3+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccccccccccc, dddddddd,
4+
};
5+
use aaaaaaaaaaaaaaa::{
6+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccccccccccc, ddddddddd,
7+
};

Diff for: ‎tests/target/imports.rs

+46-31
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,22 @@
44
// Imports.
55

66
// Long import.
7-
use exceedingly::loooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA,
8-
ItemB};
9-
use exceedingly::looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA,
10-
ItemB};
7+
use exceedingly::loooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{
8+
ItemA, ItemB,
9+
};
10+
use exceedingly::looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{
11+
ItemA, ItemB,
12+
};
1113
use syntax::ast::{ItemDefaultImpl, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic};
1214

13-
use list::{// Another item
14-
AnotherItem, // Another Comment
15-
// Last Item
16-
LastItem,
17-
// Some item
18-
SomeItem /* Comment */};
15+
use list::{
16+
// Another item
17+
AnotherItem, // Another Comment
18+
// Last Item
19+
LastItem,
20+
// Some item
21+
SomeItem, /* Comment */
22+
};
1923

2024
use test::{/* A */ self /* B */, Other /* C */};
2125

@@ -28,11 +32,14 @@ use std::io;
2832
use std::io;
2933

3034
mod Foo {
31-
pub use syntax::ast::{ItemDefaultImpl, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic};
35+
pub use syntax::ast::{
36+
ItemDefaultImpl, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic,
37+
};
3238

3339
mod Foo2 {
34-
pub use syntax::ast::{self, ItemDefaultImpl, ItemForeignMod, ItemImpl, ItemMac, ItemMod,
35-
ItemStatic};
40+
pub use syntax::ast::{
41+
self, ItemDefaultImpl, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic,
42+
};
3643
}
3744
}
3845

@@ -72,24 +79,32 @@ use foo::issue_1356::*;
7279
use self::unix::{};
7380

7481
// nested imports
75-
use foo::{a,
76-
b,
77-
bar::{baz,
78-
foo::{a, b, cxxxxxxxxxxxxx, yyyyyyyyyyyyyy, zzzzzzzzzzzzzzzz},
79-
qux,
80-
xxxxxxxxxxx,
81-
yyyyyyyyyyyyy,
82-
zzzzzzzzzzzzzzzz},
83-
boo,
84-
c};
85-
86-
use fooo::{baar::foobar::{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy,
87-
zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz},
88-
bar,
89-
bar::*,
90-
x,
91-
y,
92-
z};
82+
use foo::{
83+
a,
84+
b,
85+
bar::{
86+
baz,
87+
foo::{a, b, cxxxxxxxxxxxxx, yyyyyyyyyyyyyy, zzzzzzzzzzzzzzzz},
88+
qux,
89+
xxxxxxxxxxx,
90+
yyyyyyyyyyyyy,
91+
zzzzzzzzzzzzzzzz,
92+
},
93+
boo,
94+
c,
95+
};
96+
97+
use fooo::{
98+
baar::foobar::{
99+
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy,
100+
zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz,
101+
},
102+
bar,
103+
bar::*,
104+
x,
105+
y,
106+
z,
107+
};
93108

94109
// nested imports with a single sub-tree.
95110
use a::b::c::d;

0 commit comments

Comments
 (0)