itsscb/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-03-28 02:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use trailing commas if block formatting fn args

Browse Source 
Fixes #1330
This commit is contained in:
Nick Cameron
2017-03-09 14:47:29 +13:00
parent 6025492245
commit d107ca12b8
7 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/items.rs
View File

@@ -1776,16 +1776,16 @@ fn rewrite_args(context: &RewriteContext,
debug!("rewrite_args: budget: {}, tactic: {:?}", budget, tactic);
let end_with_newline = match context.config.fn_args_layout {
FnArgLayoutStyle::Block |
FnArgLayoutStyle::BlockAlways => true,
_ => false,
let (trailing_comma, end_with_newline) = match context.config.fn_args_layout {
FnArgLayoutStyle::Block => (SeparatorTactic::Vertical, true),
FnArgLayoutStyle::BlockAlways => (SeparatorTactic::Always, true),
_ => (SeparatorTactic::Never, false),
};
let fmt = ListFormatting {
tactic: tactic,
separator: ",",
trailing_separator: SeparatorTactic::Never,
trailing_separator: trailing_comma,
shape: Shape::legacy(budget, indent),
ends_with_newline: end_with_newline,
config: context.config,

20
tests/target/fn-custom-6.rs
View File

@@ -4,7 +4,7 @@
// Test different indents.
fn foo(
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb,
) {
foo();
}
@@ -14,13 +14,13 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) {
bar();
}
fn foo(
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb,
) -> String {
foo();
}
@@ -30,13 +30,13 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) -> String {
bar();
}
fn foo(
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb,
) where T: UUUUUUUUUUU {
foo();
}
@@ -46,13 +46,13 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) where T: UUUUUUUUUUU {
bar();
}
fn foo(
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb,
) -> String
where T: UUUUUUUUUUU {
foo();
@@ -63,7 +63,7 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) -> String
where T: UUUUUUUUUUU {
bar();
@@ -71,12 +71,12 @@ where T: UUUUUUUUUUU {
trait Test {
fn foo(
a: u8
a: u8,
) {
}
fn bar(
a: u8
a: u8,
) -> String {
}
}

10
tests/target/fn-custom-7.rs
View File

@@ -6,7 +6,7 @@
// Case with only one variable.
fn foo(
a: u8
a: u8,
) -> u8
{
bar()
@@ -15,7 +15,7 @@ fn foo(
// Case with 2 variables and some pre-comments.
fn foo(
a: u8, // Comment 1
b: u8 // Comment 2
b: u8, // Comment 2
) -> u8
{
bar()
@@ -26,7 +26,7 @@ fn foo(
// Comment 1
a: u8,
// Comment 2
b: u8
b: u8,
) -> u8
{
bar()
@@ -34,13 +34,13 @@ fn foo(
trait Test {
fn foo(
a: u8
a: u8,
)
{
}
fn bar(
a: u8
a: u8,
) -> String
{
}

8
tests/target/fn-custom-8.rs
View File

@@ -12,7 +12,7 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) {
bar();
}
@@ -26,7 +26,7 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) -> String {
bar();
}
@@ -41,7 +41,7 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) where T: UUUUUUUUUUU {
bar();
}
@@ -56,7 +56,7 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) -> String
where T: UUUUUUUUUUU {
bar();

12
tests/target/fn_args_layout-block.rs
View File

@@ -14,7 +14,7 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) {
bar();
}
@@ -28,7 +28,7 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) -> String {
bar();
}
@@ -42,7 +42,7 @@ fn foo(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee // Comment 2
e: Eeeeeeeeeeeeeee, // Comment 2
) -> u8 {
bar()
}
@@ -52,7 +52,7 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) -> String
where X: Fooooo,
Y: Baaar
@@ -107,7 +107,7 @@ trait Test {
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) -> String {
}
}
@@ -116,7 +116,7 @@ fn foo<L: Loooooooooooooooooooong, G: Geeeeeeeeeeneric, I: iiiiiiiiis, L: Looooo
a: Aaaaaaaaaaaaaaaaaaaa,
b: Bbbbbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd
d: Dddddddddddddddd,
) {
foo();
}

12
tests/target/fn_args_layout-blockalways.rs
View File

@@ -5,7 +5,7 @@ fn foo() {
}
fn foo(
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb,
) {
foo();
}
@@ -15,13 +15,13 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) {
bar();
}
fn foo(
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb
a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb,
) -> String {
foo();
}
@@ -31,19 +31,19 @@ fn bar(
b: Bbbbbbbbbbbbbb,
c: Cccccccccccccccccc,
d: Dddddddddddddddd,
e: Eeeeeeeeeeeeeee
e: Eeeeeeeeeeeeeee,
) -> String {
bar();
}
trait Test {
fn foo(
a: u8
a: u8,
) {
}
fn bar(
a: u8
a: u8,
) -> String {
}
}

8
tests/target/where-clause-rfc.rs
View File

@@ -21,7 +21,7 @@ fn reflow_list_node_with_rule(
rule: &Rule,
args: &[Arg],
shape: &Shape,
shape: &Shape
shape: &Shape,
) where
T: FOo,
U: Bar,
@@ -34,7 +34,7 @@ fn reflow_list_node_with_rule(
rule: &Rule,
args: &[Arg],
shape: &Shape,
shape: &Shape
shape: &Shape,
) where
T: FOo,
{
@@ -45,7 +45,7 @@ fn reflow_list_node_with_rule(
node: &CompoundNode,
rule: &Rule,
args: &[Arg],
shape: &Shape
shape: &Shape,
) -> Option<String>
where
T: FOo,
@@ -58,7 +58,7 @@ fn reflow_list_node_with_rule(
node: &CompoundNode,
rule: &Rule,
args: &[Arg],
shape: &Shape
shape: &Shape,
) -> Option<String>
where
T: FOo,