Cargo fmt

Author: topecongiro

rustfmt-core/rustfmt-lib/src/formatting.rs

@@ -8,14 +8,14 @@ use rustc_ast::ast;
 pub(crate) use syntux::session::ParseSess;
 
 use self::newline_style::apply_newline_style;
+use crate::config::{Config, FileName};
 use crate::formatting::{
     comment::{CharClasses, FullCodeCharKind},
     report::NonFormattedRange,
     syntux::parser::{DirectoryOwnership, Parser, ParserError},
     utils::count_newlines,
     visitor::FmtVisitor,
 };
-use crate::config::{Config, FileName};
 use crate::result::OperationError;
 use crate::{
     ErrorKind, FormatError, FormatReport, FormatResult, Input, OperationSetting, Verbosity,

rustfmt-core/rustfmt-lib/src/formatting/attr.rs

@@ -4,14 +4,13 @@ use rustc_ast::ast;
 use rustc_ast::attr::HasAttrs;
 use rustc_span::{symbol::sym, Span};
 
+use crate::config::{lists::*, IndentStyle};
 use doc_comment::DocCommentFormatter;
-use crate::config::{
-    lists::*,
-    IndentStyle,
-};
 
 use crate::formatting::{
-    comment::{contains_comment, rewrite_doc_comment, CommentStyle, recover_missing_comment_in_span},
+    comment::{
+        contains_comment, recover_missing_comment_in_span, rewrite_doc_comment, CommentStyle,
+    },
     expr::{rewrite_literal, span_ends_with_comma},
     lists::{definitive_tactic, itemize_list, write_list, ListFormatting, Separator},
     overflow,

rustfmt-core/rustfmt-lib/src/formatting/closures.rs

@@ -1,15 +1,13 @@
 use rustc_ast::{ast, ptr};
 use rustc_span::Span;
 
-use crate::config::{
-    lists::*,
-    IndentStyle,
-    SeparatorTactic,
-};
+use crate::config::{lists::*, IndentStyle, SeparatorTactic};
 use crate::formatting::{
     attr::get_attrs_from_stmt,
-    expr::{block_contains_comment, is_simple_block, is_unsafe_block, rewrite_cond,
-           rewrite_block_with_visitor},
+    expr::{
+        block_contains_comment, is_simple_block, is_unsafe_block, rewrite_block_with_visitor,
+        rewrite_cond,
+    },
     items::{span_hi_for_param, span_lo_for_param},
     lists::{definitive_tactic, itemize_list, write_list, ListFormatting, Separator},
     overflow::OverflowableItem,
@@ -162,15 +160,8 @@ fn rewrite_closure_with_block(
         rules: ast::BlockCheckMode::Default,
         span: body.span,
     };
-    let block = rewrite_block_with_visitor(
-        context,
-        "",
-        &block,
-        Some(&body.attrs),
-        None,
-        shape,
-        false,
-    )?;
+    let block =
+        rewrite_block_with_visitor(context, "", &block, Some(&body.attrs), None, shape, false)?;
     Some(format!("{} {}", prefix, block))
 }
 

rustfmt-core/rustfmt-lib/src/formatting/comment.rs

@@ -11,8 +11,8 @@ use crate::formatting::{
     shape::{Indent, Shape},
     string::{rewrite_string, StringFormat},
     utils::{
-        count_newlines, first_line_width, last_line_width, tab_to_spaces, trim_left_preserve_layout,
-        unicode_str_width,
+        count_newlines, first_line_width, last_line_width, tab_to_spaces,
+        trim_left_preserve_layout, unicode_str_width,
     },
 };
 

rustfmt-core/rustfmt-lib/src/formatting/expr.rs

@@ -6,16 +6,14 @@ use rustc_ast::token::{DelimToken, LitKind};
 use rustc_ast::{ast, ptr};
 use rustc_span::{BytePos, Span};
 
-use crate::config::{
-    lists::*,
-    Config, ControlBraceStyle, IndentStyle,
-};
+use crate::config::{lists::*, Config, ControlBraceStyle, IndentStyle};
 use crate::formatting::{
     chains::rewrite_chain,
     closures,
     comment::{
-        combine_strs_with_missing_comments, comment_style, contains_comment, recover_comment_removed,
-        rewrite_comment, rewrite_missing_comment, CharClasses, FindUncommented,
+        combine_strs_with_missing_comments, comment_style, contains_comment,
+        recover_comment_removed, rewrite_comment, rewrite_missing_comment, CharClasses,
+        FindUncommented,
     },
     lists::{
         definitive_tactic, itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape,

rustfmt-core/rustfmt-lib/src/formatting/imports.rs

@@ -13,15 +13,13 @@ use crate::config::lists::*;
 use crate::config::{Edition, IndentStyle};
 use crate::formatting::{
     comment::combine_strs_with_missing_comments,
-    lists::{
-        definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator,
-    },
+    lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator},
     reorder::{compare_as_versions, compare_opt_ident_as_versions},
     rewrite::{Rewrite, RewriteContext},
     shape::Shape,
     source_map::SpanUtils,
     spanned::Spanned,
-    utils::{is_same_visibility, mk_sp, rewrite_ident, format_visibility},
+    utils::{format_visibility, is_same_visibility, mk_sp, rewrite_ident},
     visitor::FmtVisitor,
 };
 
@@ -234,9 +232,10 @@ impl UseTree {
         context: &RewriteContext<'_>,
         shape: Shape,
     ) -> Option<String> {
-        let vis = self.visibility.as_ref().map_or(Cow::from(""), |vis| {
-            format_visibility(context, &vis)
-        });
+        let vis = self
+            .visibility
+            .as_ref()
+            .map_or(Cow::from(""), |vis| format_visibility(context, &vis));
         let use_str = self
             .rewrite(context, shape.offset_left(vis.len())?)
             .map(|s| {

rustfmt-core/rustfmt-lib/src/formatting/lists.rs

@@ -6,11 +6,7 @@ use std::iter::Peekable;
 use rustc_span::BytePos;
 use unicode_segmentation::UnicodeSegmentation;
 
-use crate::config::{
-    lists::*,
-    Config,
-    IndentStyle,
-};
+use crate::config::{lists::*, Config, IndentStyle};
 use crate::formatting::{
     comment::{find_comment_end, rewrite_comment, FindUncommented},
     rewrite::RewriteContext,

rustfmt-core/rustfmt-lib/src/formatting/macros.rs

@@ -22,26 +22,25 @@ use rustc_span::{
     BytePos, Span, Symbol, DUMMY_SP,
 };
 
+use crate::config::lists::*;
 use crate::formatting::{
-    comment::{
-        contains_comment, CharClasses, FindUncommented, FullCodeCharKind, LineClasses,
-    },
+    comment::{contains_comment, CharClasses, FindUncommented, FullCodeCharKind, LineClasses},
     expr::{rewrite_array, rewrite_assign_rhs},
-    report::NonFormattedRange,
     lists::{itemize_list, write_list, ListFormatting},
     overflow,
+    report::NonFormattedRange,
     rewrite::{Rewrite, RewriteContext},
     shape::{Indent, Shape},
     source_map::SpanUtils,
     spanned::Spanned,
-    util::{format_snippet, format_code_block},
+    util::{format_code_block, format_snippet},
     utils::{
         count_newlines, format_visibility, indent_next_line, is_empty_line, mk_sp,
-        remove_trailing_white_spaces, rewrite_ident, trim_left_preserve_layout, wrap_str, NodeIdExt,
+        remove_trailing_white_spaces, rewrite_ident, trim_left_preserve_layout, wrap_str,
+        NodeIdExt,
     },
     visitor::FmtVisitor,
 };
-use crate::config::lists::*;
 
 const FORCED_BRACKET_MACROS: &[&str] = &["vec!"];
 

rustfmt-core/rustfmt-lib/src/formatting/matches.rs

@@ -5,26 +5,26 @@ use std::iter::repeat;
 use rustc_ast::{ast, ptr};
 use rustc_span::{BytePos, Span};
 
+use crate::config::{
+    lists::*,
+    Config, ControlBraceStyle, IndentStyle, MatchArmLeadingPipe,
+};
 use crate::formatting::{
     comment::{combine_strs_with_missing_comments, rewrite_comment},
     expr::{
-        format_expr, is_empty_block, is_simple_block, is_unsafe_block, prefer_next_line, rewrite_cond,
-        ExprType, RhsTactics,
+        format_expr, is_empty_block, is_simple_block, is_unsafe_block, prefer_next_line,
+        rewrite_cond, ExprType, RhsTactics,
     },
     lists::{itemize_list, write_list, ListFormatting},
     rewrite::{Rewrite, RewriteContext},
     shape::Shape,
     source_map::SpanUtils,
     spanned::Spanned,
     utils::{
-        contains_skip, extra_offset, first_line_width, inner_attributes, last_line_extendable, mk_sp,
-        semicolon_for_expr, trimmed_last_line_width, unicode_str_width,
+        contains_skip, extra_offset, first_line_width, inner_attributes, last_line_extendable,
+        mk_sp, semicolon_for_expr, trimmed_last_line_width, unicode_str_width,
     },
 };
-use crate::config::{
-    lists::*,
-    Config, ControlBraceStyle, IndentStyle, MatchArmLeadingPipe,
-};
 
 /// A simple wrapper type against `ast::Arm`. Used inside `write_list()`.
 struct ArmWrapper<'a> {

rustfmt-core/rustfmt-lib/src/formatting/missed_spans.rs

@@ -1,16 +1,14 @@
 use rustc_span::{BytePos, Pos, Span};
 
-use crate::config::{
-    file_lines::FileLines,
-    FileName,
-};
+use crate::config::{file_lines::FileLines, FileName};
 
 use crate::formatting::{
     comment::{is_last_comment_block, rewrite_comment, CodeCharKind, CommentCodeSlices},
     shape::{Indent, Shape},
     source_map::LineRangeUtils,
     utils::{
-        count_lf_crlf, count_newlines, last_line_contains_single_line_comment, last_line_width, mk_sp,
+        count_lf_crlf, count_newlines, last_line_contains_single_line_comment, last_line_width,
+        mk_sp,
     },
     visitor::FmtVisitor,
 };

rustfmt-core/rustfmt-lib/src/formatting/modules.rs

@@ -6,14 +6,14 @@ use rustc_ast::ast;
 use rustc_ast::visit::Visitor;
 use rustc_span::symbol::{self, sym, Symbol};
 
+use crate::config::FileName;
 use crate::formatting::{
     attr::MetaVisitor,
     items::is_mod_decl,
     syntux::parser::{Directory, DirectoryOwnership, ModulePathSuccess, Parser},
     syntux::session::ParseSess,
     utils::contains_skip,
 };
-use crate::config::FileName;
 
 mod visitor;
 

rustfmt-core/rustfmt-lib/src/formatting/modules/visitor.rs

@@ -2,11 +2,7 @@ use rustc_ast::ast;
 use rustc_ast::visit::Visitor;
 use rustc_span::Symbol;
 
-use crate::formatting::{
-    attr::MetaVisitor,
-    syntux::parser::Parser,
-    syntux::session::ParseSess,
-};
+use crate::formatting::{attr::MetaVisitor, syntux::parser::Parser, syntux::session::ParseSess};
 
 pub(crate) struct ModItem {
     pub(crate) item: ast::Item,

rustfmt-core/rustfmt-lib/src/formatting/overflow.rs

@@ -7,15 +7,16 @@ use rustc_ast::token::DelimToken;
 use rustc_ast::{ast, ptr};
 use rustc_span::Span;
 
+use crate::config::lists::*;
 use crate::formatting::{
     closures,
     expr::{
-        can_be_overflowed_expr, is_every_expr_simple, is_method_call, is_nested_call, is_simple_expr,
-        rewrite_cond,
+        can_be_overflowed_expr, is_every_expr_simple, is_method_call, is_nested_call,
+        is_simple_expr, rewrite_cond,
     },
     lists::{
-        definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator,
-        total_item_width,
+        definitive_tactic, itemize_list, total_item_width, write_list, ListFormatting, ListItem,
+        Separator,
     },
     macros::MacroArg,
     patterns::{can_be_overflowed_pat, TuplePatField},
@@ -26,7 +27,6 @@ use crate::formatting::{
     types::{can_be_overflowed_type, SegmentParam},
     utils::{count_newlines, extra_offset, first_line_width, last_line_width, mk_sp},
 };
-use crate::config::lists::*;
 
 const SHORT_ITEM_THRESHOLD: usize = 10;
 

rustfmt-core/rustfmt-lib/src/formatting/pairs.rs

@@ -5,9 +5,7 @@ use crate::config::IndentStyle;
 use crate::formatting::{
     rewrite::{Rewrite, RewriteContext},
     shape::Shape,
-    utils::{
-        first_line_width, is_single_line, last_line_width, trimmed_last_line_width, wrap_str,
-    },
+    utils::{first_line_width, is_single_line, last_line_width, trimmed_last_line_width, wrap_str},
 };
 
 /// Sigils that decorate a binop pair.

rustfmt-core/rustfmt-lib/src/formatting/source_map.rs

@@ -4,10 +4,7 @@
 use rustc_span::{BytePos, Span};
 
 use crate::config::file_lines::LineRange;
-use crate::formatting::{
-    comment::FindUncommented,
-    visitor::SnippetProvider,
-};
+use crate::formatting::{comment::FindUncommented, visitor::SnippetProvider};
 
 pub(crate) trait SpanUtils {
     fn span_after(&self, original: Span, needle: &str) -> BytePos;

rustfmt-core/rustfmt-lib/src/formatting/syntux/session.rs

@@ -11,18 +11,12 @@ use rustc_span::{
     symbol, BytePos, Span,
 };
 
-use crate::config::{
-    Config,
-    FileName,
-    file_lines::LineRange,
+use crate::config::{file_lines::LineRange, Config, FileName};
+use crate::formatting::{
+    source_map::LineRangeUtils, utils::starts_with_newline, visitor::SnippetProvider,
 };
 use crate::ignore_path::IgnorePathSet;
 use crate::result::OperationError;
-use crate::formatting::{
-    source_map::LineRangeUtils,
-    utils::starts_with_newline,
-    visitor::SnippetProvider,
-};
 
 /// ParseSess holds structs necessary for constructing a parser.
 pub(crate) struct ParseSess {
@@ -275,8 +269,8 @@ mod tests {
     mod emitter {
         use super::*;
         use crate::config::IgnoreList;
-        use crate::is_nightly_channel;
         use crate::formatting::utils::mk_sp;
+        use crate::is_nightly_channel;
         use rustc_span::{FileName as SourceMapFileName, MultiSpan, DUMMY_SP};
         use std::path::PathBuf;
 

rustfmt-core/rustfmt-lib/src/formatting/types.rs

@@ -4,16 +4,10 @@ use std::ops::Deref;
 use rustc_ast::ast::{self, FnRetTy, Mutability};
 use rustc_span::{symbol::kw, BytePos, Span};
 
-use crate::config::{
-    lists::*,
-    IndentStyle,
-    TypeDensity,
-};
+use crate::config::{lists::*, IndentStyle, TypeDensity};
 use crate::formatting::{
     expr::{format_expr, rewrite_assign_rhs, rewrite_tuple, rewrite_unary_prefix, ExprType},
-    lists::{
-        definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator,
-    },
+    lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator},
     macros::{rewrite_macro, MacroPosition},
     overflow,
     pairs::{rewrite_pair, PairParts},
@@ -23,8 +17,7 @@ use crate::formatting::{
     spanned::Spanned,
     utils::{
         colon_spaces, extra_offset, first_line_width, format_extern, format_mutability,
-        last_line_extendable, last_line_width, mk_sp, rewrite_ident,
-        format_unsafety,
+        format_unsafety, last_line_extendable, last_line_width, mk_sp, rewrite_ident,
     },
 };
 

rustfmt-core/rustfmt-lib/src/formatting/util.rs

@@ -1,10 +1,7 @@
-use crate::{config::Config, emitter::Verbosity, Input, NewlineStyle, OperationSetting};
 use crate::formatting::{
-    comment::LineClasses,
-    FormattedSnippet,
-    shape::Indent,
-    utils::indent_next_line,
+    comment::LineClasses, shape::Indent, utils::indent_next_line, FormattedSnippet,
 };
+use crate::{config::Config, emitter::Verbosity, Input, NewlineStyle, OperationSetting};
 
 /// Format the given snippet. The snippet is expected to be *complete* code.
 /// When we cannot parse the given snippet, this function returns `None`.