Skip to content

Commit 5addca7

Browse files
author
topecongiro
committed
Run rustfmt
1 parent 6606237 commit 5addca7

File tree

8 files changed

+11
-17
lines changed

8 files changed

+11
-17
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,7 @@ mod test {
428428

429429
let used_options = config.used_options();
430430
let toml = used_options.to_toml().unwrap();
431-
assert_eq!(
432-
toml,
433-
"merge_derives = false\n"
434-
);
431+
assert_eq!(toml, "merge_derives = false\n");
435432
}
436433

437434
#[test]

rustfmt-core/rustfmt-emitter/src/diff.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustfmt_configuration::Config;
22

3-
use crate::rustfmt_diff::{make_diff, print_diff};
43
use super::*;
4+
use crate::rustfmt_diff::{make_diff, print_diff};
55

66
pub struct DiffEmitter {
77
config: Config,

rustfmt-core/rustfmt-emitter/src/rustfmt_diff.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,5 +424,4 @@ mod test {
424424
let diff = make_diff("a\nb\nc\nd", "a\nb\nc\nd", 3);
425425
assert_eq!(diff, vec![]);
426426
}
427-
428427
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ fn is_block_closure_forced(
415415
false
416416
} else {
417417
if let ast::ExprKind::Match(..) = expr.kind {
418-
let is_move_closure_without_brace =
419-
capture == ast::CaptureBy::Value && !context.snippet(expr.span).trim().starts_with("{");
418+
let is_move_closure_without_brace = capture == ast::CaptureBy::Value
419+
&& !context.snippet(expr.span).trim().starts_with("{");
420420

421421
is_block_closure_forced_inner(expr) || is_move_closure_without_brace
422422
} else {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ use crate::rewrite::{Rewrite, RewriteContext};
3434
use crate::shape::{Indent, Shape};
3535
use crate::source_map::SpanUtils;
3636
use crate::spanned::Spanned;
37-
use crate::utils::{format_visibility, indent_next_line, is_empty_line, mk_sp, remove_trailing_white_spaces, rewrite_ident, trim_left_preserve_layout, wrap_str, NodeIdExt, count_newlines};
37+
use crate::utils::{
38+
count_newlines, format_visibility, indent_next_line, is_empty_line, mk_sp,
39+
remove_trailing_white_spaces, rewrite_ident, trim_left_preserve_layout, wrap_str, NodeIdExt,
40+
};
3841
use crate::visitor::FmtVisitor;
3942

4043
const FORCED_BRACKET_MACROS: &[&str] = &["vec!"];

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,5 @@ fn format_stmt(
107107
}
108108
ast::StmtKind::Mac(..) | ast::StmtKind::Item(..) => None,
109109
};
110-
result.and_then(|res| {
111-
recover_comment_removed(res, stmt.span(), context)
112-
})
110+
result.and_then(|res| recover_comment_removed(res, stmt.span(), context))
113111
}

rustfmt-core/rustfmt-lib/src/test/configuration_snippet.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use std::path::{Path, PathBuf};
66

77
use rustfmt_emitter::rustfmt_diff::{make_diff, Mismatch};
88

9+
use super::{print_mismatches, write_message, DIFF_CONTEXT_SIZE};
910
use crate::config::{Config, EmitMode, Verbosity};
1011
use crate::{Input, Session};
11-
use super::{print_mismatches, write_message, DIFF_CONTEXT_SIZE};
1212

1313
const CONFIGURATIONS_FILE_NAME: &str = "../../Configurations.md";
1414

rustfmt-core/rustfmt-lib/src/test/mod.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ use std::path::{Path, PathBuf};
77
use std::str::Chars;
88
use std::thread;
99

10-
use rustfmt_emitter::rustfmt_diff::{
11-
make_diff, print_diff, Mismatch, ModifiedChunk, OutputWriter,
12-
};
10+
use rustfmt_emitter::rustfmt_diff::{make_diff, print_diff, Mismatch, ModifiedChunk, OutputWriter};
1311

1412
use crate::config::{Color, Config, EmitMode, FileName, NewlineStyle, ReportTactic};
1513
use crate::formatting::{ReportedErrors, SourceFile};
@@ -809,4 +807,3 @@ fn string_eq_ignore_newline_repr_test() {
809807
assert!(string_eq_ignore_newline_repr("a\r\n\r\n\r\nb", "a\n\n\nb"));
810808
assert!(!string_eq_ignore_newline_repr("a\r\nbcd", "a\nbcdefghijk"));
811809
}
812-

0 commit comments

Comments
 (0)