Skip to content

Commit

Permalink
update self format
Browse files Browse the repository at this point in the history
  • Loading branch information
csmoe committed Apr 29, 2018
1 parent c9cef5d commit f7415bc
Show file tree
Hide file tree
Showing 12 changed files with 100 additions and 58 deletions.
44 changes: 26 additions & 18 deletions Configurations.md
Original file line number Diff line number Diff line change
Expand Up @@ -1042,8 +1042,10 @@ Item layout inside a imports block
```rust
use foo::{xxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzzzz};

use foo::{aaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbb, cccccccccccccccccc, dddddddddddddddddd,
eeeeeeeeeeeeeeeeee, ffffffffffffffffff};
use foo::{
aaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbb, cccccccccccccccccc, dddddddddddddddddd,
eeeeeeeeeeeeeeeeee, ffffffffffffffffff,
};
```

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

use foo::{aaaaaaaaaaaaaaaaaa,
bbbbbbbbbbbbbbbbbb,
cccccccccccccccccc,
dddddddddddddddddd,
eeeeeeeeeeeeeeeeee,
ffffffffffffffffff};
use foo::{
aaaaaaaaaaaaaaaaaa,
bbbbbbbbbbbbbbbbbb,
cccccccccccccccccc,
dddddddddddddddddd,
eeeeeeeeeeeeeeeeee,
ffffffffffffffffff,
};
```

#### `"Vertical"`:

```rust
use foo::{xxx,
yyy,
zzz};
use foo::{
xxx,
yyy,
zzz,
};

use foo::{aaa,
bbb,
ccc,
ddd,
eee,
fff};
use foo::{
aaa,
bbb,
ccc,
ddd,
eee,
fff,
};
```

## `merge_imports`
Expand Down Expand Up @@ -2036,7 +2044,7 @@ fn foo() {

## `required_version`

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

- **Default value**: `CARGO_PKG_VERSION`
Expand Down
6 changes: 4 additions & 2 deletions src/bin/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ use failure::err_msg;

use getopts::{Matches, Options};

use rustfmt::{emit_post_matter, emit_pre_matter, load_config, CliOptions, Config, FmtResult,
WriteMode, WRITE_MODE_LIST};
use rustfmt::{
emit_post_matter, emit_pre_matter, load_config, CliOptions, Config, FmtResult, WriteMode,
WRITE_MODE_LIST,
};
use rustfmt::{format_and_emit_report, FileName, Input, Summary};

fn main() {
Expand Down
6 changes: 4 additions & 2 deletions src/chains.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ use expr::rewrite_call;
use macros::convert_try_mac;
use rewrite::{Rewrite, RewriteContext};
use shape::Shape;
use utils::{first_line_width, last_line_extendable, last_line_width, mk_sp,
trimmed_last_line_width, wrap_str};
use utils::{
first_line_width, last_line_extendable, last_line_width, mk_sp, trimmed_last_line_width,
wrap_str,
};

use std::borrow::Cow;
use std::cmp::min;
Expand Down
20 changes: 13 additions & 7 deletions src/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@ use syntax::{ast, ptr};
use chains::rewrite_chain;
use closures;
use codemap::{LineRangeUtils, SpanUtils};
use comment::{combine_strs_with_missing_comments, contains_comment, recover_comment_removed,
rewrite_comment, rewrite_missing_comment, CharClasses, FindUncommented};
use comment::{
combine_strs_with_missing_comments, contains_comment, recover_comment_removed, rewrite_comment,
rewrite_missing_comment, CharClasses, FindUncommented,
};
use config::{Config, ControlBraceStyle, IndentStyle};
use lists::{definitive_tactic, itemize_list, shape_for_tactic, struct_lit_formatting,
struct_lit_shape, struct_lit_tactic, write_list, ListFormatting, ListItem, Separator};
use lists::{
definitive_tactic, itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape,
struct_lit_tactic, write_list, ListFormatting, ListItem, Separator,
};
use macros::{rewrite_macro, MacroArg, MacroPosition};
use matches::rewrite_match;
use overflow;
Expand All @@ -33,9 +37,11 @@ use shape::{Indent, Shape};
use spanned::Spanned;
use string::{rewrite_string, StringFormat};
use types::{can_be_overflowed_type, rewrite_path, PathContext};
use utils::{colon_spaces, contains_skip, count_newlines, first_line_width, inner_attributes,
last_line_extendable, last_line_width, mk_sp, outer_attributes, paren_overhead,
ptr_vec_to_ref_vec, semicolon_for_stmt, wrap_str};
use utils::{
colon_spaces, contains_skip, count_newlines, first_line_width, inner_attributes,
last_line_extendable, last_line_width, mk_sp, outer_attributes, paren_overhead,
ptr_vec_to_ref_vec, semicolon_for_stmt, wrap_str,
};
use vertical::rewrite_with_alignment;
use visitor::FmtVisitor;

Expand Down
24 changes: 15 additions & 9 deletions src/items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,29 @@ use syntax::visit;
use syntax::{ast, ptr, symbol};

use codemap::{LineRangeUtils, SpanUtils};
use comment::{combine_strs_with_missing_comments, contains_comment, recover_comment_removed,
recover_missing_comment_in_span, rewrite_missing_comment, FindUncommented};
use comment::{
combine_strs_with_missing_comments, contains_comment, recover_comment_removed,
recover_missing_comment_in_span, rewrite_missing_comment, FindUncommented,
};
use config::{BraceStyle, Config, Density, IndentStyle};
use expr::{format_expr, is_empty_block, is_simple_block_stmt, rewrite_assign_rhs,
rewrite_assign_rhs_with, ExprType, RhsTactics};
use expr::{
format_expr, is_empty_block, is_simple_block_stmt, rewrite_assign_rhs, rewrite_assign_rhs_with,
ExprType, RhsTactics,
};
use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator};
use macros::{rewrite_macro, MacroPosition};
use overflow;
use rewrite::{Rewrite, RewriteContext};
use shape::{Indent, Shape};
use spanned::Spanned;
use types::TraitTyParamBounds;
use utils::{colon_spaces, contains_skip, first_line_width, format_abi, format_auto,
format_constness, format_defaultness, format_mutability, format_unsafety,
format_visibility, is_attributes_extendable, last_line_contains_single_line_comment,
last_line_used_width, last_line_width, mk_sp, semicolon_for_expr, starts_with_newline,
stmt_expr, trimmed_last_line_width};
use utils::{
colon_spaces, contains_skip, first_line_width, format_abi, format_auto, format_constness,
format_defaultness, format_mutability, format_unsafety, format_visibility,
is_attributes_extendable, last_line_contains_single_line_comment, last_line_used_width,
last_line_width, mk_sp, semicolon_for_expr, starts_with_newline, stmt_expr,
trimmed_last_line_width,
};
use vertical::rewrite_with_alignment;
use visitor::FmtVisitor;

Expand Down
6 changes: 4 additions & 2 deletions src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ use syntax::util::ThinVec;
use syntax::{ast, ptr};

use codemap::SpanUtils;
use comment::{contains_comment, remove_trailing_white_spaces, CharClasses, FindUncommented,
FullCodeCharKind, LineClasses};
use comment::{
contains_comment, remove_trailing_white_spaces, CharClasses, FindUncommented, FullCodeCharKind,
LineClasses,
};
use expr::rewrite_array;
use lists::{itemize_list, write_list, ListFormatting};
use overflow;
Expand Down
12 changes: 8 additions & 4 deletions src/matches.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@ use syntax::{ast, ptr};
use codemap::SpanUtils;
use comment::combine_strs_with_missing_comments;
use config::{Config, ControlBraceStyle, IndentStyle};
use expr::{format_expr, is_empty_block, is_simple_block, is_unsafe_block, prefer_next_line,
rewrite_multiple_patterns, ExprType, RhsTactics, ToExpr};
use expr::{
format_expr, is_empty_block, is_simple_block, is_unsafe_block, prefer_next_line,
rewrite_multiple_patterns, ExprType, RhsTactics, ToExpr,
};
use lists::{itemize_list, write_list, ListFormatting};
use rewrite::{Rewrite, RewriteContext};
use shape::Shape;
use spanned::Spanned;
use utils::{contains_skip, extra_offset, first_line_width, inner_attributes, last_line_extendable,
mk_sp, ptr_vec_to_ref_vec, trimmed_last_line_width};
use utils::{
contains_skip, extra_offset, first_line_width, inner_attributes, last_line_extendable, mk_sp,
ptr_vec_to_ref_vec, trimmed_last_line_width,
};

/// A simple wrapper type against `ast::Arm`. Used inside `write_list()`.
struct ArmWrapper<'a> {
Expand Down
4 changes: 3 additions & 1 deletion src/overflow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListIte
use rewrite::{Rewrite, RewriteContext};
use shape::Shape;
use spanned::Spanned;
use utils::{count_newlines, extra_offset, first_line_width, last_line_width, mk_sp, paren_overhead};
use utils::{
count_newlines, extra_offset, first_line_width, last_line_width, mk_sp, paren_overhead,
};

use std::cmp::min;

Expand Down
11 changes: 7 additions & 4 deletions src/patterns.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@ use syntax::ptr;

use codemap::SpanUtils;
use comment::FindUncommented;
use expr::{can_be_overflowed_expr, rewrite_pair, rewrite_unary_prefix, wrap_struct_field,
PairParts};
use lists::{itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape,
struct_lit_tactic, write_list};
use expr::{
can_be_overflowed_expr, rewrite_pair, rewrite_unary_prefix, wrap_struct_field, PairParts,
};
use lists::{
itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape, struct_lit_tactic,
write_list,
};
use macros::{rewrite_macro, MacroPosition};
use overflow;
use rewrite::{Rewrite, RewriteContext};
Expand Down
11 changes: 7 additions & 4 deletions src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,19 @@ use syntax::symbol::keywords;

use codemap::SpanUtils;
use config::{IndentStyle, TypeDensity};
use expr::{rewrite_assign_rhs, rewrite_pair, rewrite_tuple, rewrite_unary_prefix, PairParts,
ToExpr};
use expr::{
rewrite_assign_rhs, rewrite_pair, rewrite_tuple, rewrite_unary_prefix, PairParts, ToExpr,
};
use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, Separator};
use macros::{rewrite_macro, MacroPosition};
use overflow;
use rewrite::{Rewrite, RewriteContext};
use shape::Shape;
use spanned::Spanned;
use utils::{colon_spaces, extra_offset, first_line_width, format_abi, format_mutability,
last_line_width, mk_sp};
use utils::{
colon_spaces, extra_offset, first_line_width, format_abi, format_mutability, last_line_width,
mk_sp,
};

#[derive(Copy, Clone, Debug, Eq, PartialEq)]
pub enum PathContext {
Expand Down
6 changes: 4 additions & 2 deletions src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
use std::borrow::Cow;

use rustc_target::spec::abi;
use syntax::ast::{self, Attribute, CrateSugar, MetaItem, MetaItemKind, NestedMetaItem,
NestedMetaItemKind, Path, Visibility, VisibilityKind};
use syntax::ast::{
self, Attribute, CrateSugar, MetaItem, MetaItemKind, NestedMetaItem, NestedMetaItemKind, Path,
Visibility, VisibilityKind,
};
use syntax::codemap::{BytePos, Span, NO_EXPANSION};
use syntax::ptr;

Expand Down
8 changes: 5 additions & 3 deletions src/visitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ use attr::*;
use codemap::{LineRangeUtils, SpanUtils};
use comment::{CodeCharKind, CommentCodeSlices, FindUncommented};
use config::{BraceStyle, Config};
use items::{format_impl, format_trait, format_trait_alias, is_mod_decl, is_use_item,
rewrite_associated_impl_type, rewrite_associated_type, rewrite_extern_crate,
rewrite_type_alias, FnSig, StaticParts, StructParts};
use items::{
format_impl, format_trait, format_trait_alias, is_mod_decl, is_use_item,
rewrite_associated_impl_type, rewrite_associated_type, rewrite_extern_crate,
rewrite_type_alias, FnSig, StaticParts, StructParts,
};
use macros::{rewrite_macro, rewrite_macro_def, MacroPosition};
use rewrite::{Rewrite, RewriteContext};
use shape::{Indent, Shape};
Expand Down

0 comments on commit f7415bc

Please sign in to comment.