Skip to content

Commit 1ef6bcc

Browse files
committed
Cargo fmt
Run 'cargo fmt' with the following setting: ``` reorder_imports = true reorder_imports_in_group = true ```
1 parent 6714a44 commit 1ef6bcc

11 files changed

+16
-16
lines changed

src/chains.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@
5959
//! .qux
6060
//! ```
6161
62-
use shape::Shape;
6362
use config::IndentStyle;
6463
use expr::rewrite_call;
6564
use macros::convert_try_mac;
6665
use rewrite::{Rewrite, RewriteContext};
66+
use shape::Shape;
6767
use utils::{first_line_width, last_line_extendable, last_line_width, mk_sp,
6868
trimmed_last_line_width, wrap_str};
6969

src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ use std::fs::File;
1717
use std::io::{Error, ErrorKind, Read};
1818
use std::path::{Path, PathBuf};
1919

20+
use Summary;
2021
use file_lines::FileLines;
2122
use lists::{ListTactic, SeparatorPlace, SeparatorTactic};
22-
use Summary;
2323

2424
/// Check if we're in a nightly build.
2525
///

src/expr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::cmp::min;
1211
use std::borrow::Cow;
12+
use std::cmp::min;
1313
use std::iter::{repeat, ExactSizeIterator};
1414

1515
use syntax::{ast, ptr};
1616
use syntax::codemap::{BytePos, CodeMap, Span};
1717

18-
use spanned::Spanned;
1918
use chains::rewrite_chain;
2019
use closures;
2120
use codemap::{LineRangeUtils, SpanUtils};
@@ -29,6 +28,7 @@ use macros::{rewrite_macro, MacroArg, MacroPosition};
2928
use patterns::{can_be_overflowed_pat, TuplePatField};
3029
use rewrite::{Rewrite, RewriteContext};
3130
use shape::{Indent, Shape};
31+
use spanned::Spanned;
3232
use string::{rewrite_string, StringFormat};
3333
use types::{can_be_overflowed_type, rewrite_path, PathContext};
3434
use utils::{colon_spaces, contains_skip, extra_offset, first_line_width, inner_attributes,

src/filemap.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ where
120120
match config.write_mode() {
121121
WriteMode::Replace => {
122122
let filename = filename_to_path();
123-
if let Ok((ori, fmt)) = source_and_formatted_text(text, &filename, config) {
123+
if let Ok((ori, fmt)) = source_and_formatted_text(text, filename, config) {
124124
if fmt != ori {
125125
// Do a little dance to make writing safer - write to a temp file
126126
// rename the original to a .bk, then rename the temp file to the
@@ -141,7 +141,7 @@ where
141141
WriteMode::Overwrite => {
142142
// Write text directly over original file if there is a diff.
143143
let filename = filename_to_path();
144-
let (source, formatted) = source_and_formatted_text(text, &filename, config)?;
144+
let (source, formatted) = source_and_formatted_text(text, filename, config)?;
145145
if source != formatted {
146146
let file = File::create(filename)?;
147147
write_system_newlines(file, text, config)?;
@@ -156,7 +156,7 @@ where
156156
}
157157
WriteMode::Diff => {
158158
let filename = filename_to_path();
159-
if let Ok((ori, fmt)) = source_and_formatted_text(text, &filename, config) {
159+
if let Ok((ori, fmt)) = source_and_formatted_text(text, filename, config) {
160160
let mismatch = make_diff(&ori, &fmt, 3);
161161
let has_diff = !mismatch.is_empty();
162162
print_diff(
@@ -169,7 +169,7 @@ where
169169
}
170170
WriteMode::Checkstyle => {
171171
let filename = filename_to_path();
172-
let diff = create_diff(&filename, text, config)?;
172+
let diff = create_diff(filename, text, config)?;
173173
output_checkstyle_file(out, filename, diff)?;
174174
}
175175
}

src/imports.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ use std::cmp::Ordering;
1313
use syntax::ast;
1414
use syntax::codemap::{BytePos, Span};
1515

16-
use spanned::Spanned;
1716
use codemap::SpanUtils;
1817
use comment::combine_strs_with_missing_comments;
1918
use config::IndentStyle;
2019
use lists::{definitive_tactic, itemize_list, write_list, DefinitiveListTactic, ListFormatting,
2120
ListItem, Separator, SeparatorPlace, SeparatorTactic};
2221
use rewrite::{Rewrite, RewriteContext};
2322
use shape::Shape;
23+
use spanned::Spanned;
2424
use types::{rewrite_path, PathContext};
2525
use utils::{format_visibility, mk_sp};
2626
use visitor::{rewrite_extern_crate, FmtVisitor};

src/items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use syntax::ast::{CrateSugar, ImplItem};
1818
use syntax::codemap::{BytePos, Span};
1919
use syntax::visit;
2020

21-
use spanned::Spanned;
2221
use codemap::{LineRangeUtils, SpanUtils};
2322
use comment::{combine_strs_with_missing_comments, contains_comment, recover_comment_removed,
2423
recover_missing_comment_in_span, rewrite_missing_comment, FindUncommented};
@@ -29,6 +28,7 @@ use lists::{definitive_tactic, itemize_list, write_list, DefinitiveListTactic, L
2928
ListItem, ListTactic, Separator, SeparatorPlace, SeparatorTactic};
3029
use rewrite::{Rewrite, RewriteContext};
3130
use shape::{Indent, Shape};
31+
use spanned::Spanned;
3232
use types::join_bounds;
3333
use utils::{colon_spaces, contains_skip, end_typaram, first_line_width, format_abi,
3434
format_constness, format_defaultness, format_mutability, format_unsafety,

src/modules.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// except according to those terms.
1010

1111
use std::collections::BTreeMap;
12-
use std::path::{Path, PathBuf};
1312
use std::io;
13+
use std::path::{Path, PathBuf};
1414

1515
use syntax::ast;
1616
use syntax::codemap::{self, FileName};

src/patterns.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use syntax::ast::{self, BindingMode, FieldPat, Pat, PatKind, RangeEnd, RangeSynt
1212
use syntax::codemap::{self, BytePos, Span};
1313
use syntax::ptr;
1414

15-
use spanned::Spanned;
1615
use codemap::SpanUtils;
1716
use comment::FindUncommented;
1817
use expr::{can_be_overflowed_expr, rewrite_call_inner, rewrite_pair, rewrite_unary_prefix,
@@ -22,6 +21,7 @@ use lists::{itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_sh
2221
use macros::{rewrite_macro, MacroPosition};
2322
use rewrite::{Rewrite, RewriteContext};
2423
use shape::Shape;
24+
use spanned::Spanned;
2525
use types::{rewrite_path, PathContext};
2626
use utils::{format_mutability, mk_sp};
2727

src/types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use syntax::codemap::{self, BytePos, Span};
1616
use syntax::print::pprust;
1717
use syntax::symbol::keywords;
1818

19-
use spanned::Spanned;
2019
use codemap::SpanUtils;
2120
use config::{IndentStyle, TypeDensity};
2221
use expr::{rewrite_pair, rewrite_tuple, rewrite_unary_prefix, wrap_args_with_parens, PairParts};
@@ -26,6 +25,7 @@ use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListTac
2625
use macros::{rewrite_macro, MacroPosition};
2726
use rewrite::{Rewrite, RewriteContext};
2827
use shape::Shape;
28+
use spanned::Spanned;
2929
use utils::{colon_spaces, extra_offset, first_line_width, format_abi, format_mutability,
3030
last_line_width, mk_sp};
3131

src/vertical.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ use std::cmp;
1515
use syntax::ast;
1616
use syntax::codemap::{BytePos, Span};
1717

18-
use spanned::Spanned;
1918
use codemap::SpanUtils;
2019
use comment::{combine_strs_with_missing_comments, contains_comment};
2120
use expr::rewrite_field;
@@ -24,6 +23,7 @@ use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListTac
2423
SeparatorPlace};
2524
use rewrite::{Rewrite, RewriteContext};
2625
use shape::{Indent, Shape};
26+
use spanned::Spanned;
2727
use utils::{contains_skip, is_attributes_extendable, mk_sp};
2828

2929
pub trait AlignedItem {

src/visitor.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@ use syntax::attr::HasAttrs;
1515
use syntax::codemap::{self, BytePos, CodeMap, Pos, Span};
1616
use syntax::parse::ParseSess;
1717

18-
use expr::rewrite_literal;
19-
use spanned::Spanned;
2018
use codemap::{LineRangeUtils, SpanUtils};
2119
use comment::{combine_strs_with_missing_comments, contains_comment, remove_trailing_white_spaces,
2220
CodeCharKind, CommentCodeSlices, FindUncommented};
2321
use comment::rewrite_comment;
2422
use config::{BraceStyle, Config};
23+
use expr::rewrite_literal;
2524
use items::{format_impl, format_trait, format_trait_alias, rewrite_associated_impl_type,
2625
rewrite_associated_type, rewrite_type_alias, FnSig, StaticParts, StructParts};
2726
use lists::{itemize_list, write_list, DefinitiveListTactic, ListFormatting, SeparatorPlace,
@@ -30,6 +29,7 @@ use macros::{rewrite_macro, MacroPosition};
3029
use regex::Regex;
3130
use rewrite::{Rewrite, RewriteContext};
3231
use shape::{Indent, Shape};
32+
use spanned::Spanned;
3333
use utils::{self, contains_skip, count_newlines, inner_attributes, mk_sp, ptr_vec_to_ref_vec};
3434

3535
fn is_use_item(item: &ast::Item) -> bool {

0 commit comments

Comments
 (0)