Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into subtree-sync-2021…
…-12-19
- Loading branch information
Showing
20 changed files
with
161 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
#![rustfmt::skip] | ||
|
||
mod bar { | ||
|
||
mod baz;} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
fn baz() { } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#![rustfmt::skip] | ||
|
||
mod foo; | ||
mod one; | ||
|
||
fn main() {println!("Hello, world!"); | ||
} | ||
|
||
// trailing commet |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
struct One { value: String } |
10 changes: 10 additions & 0 deletions
10
tests/target/issue-5066/multi_line_struct_trailing_comma_always_struct_lit_width_0.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// rustfmt-trailing_comma: Always | ||
// rustfmt-struct_lit_single_line: false | ||
// rustfmt-struct_lit_width: 0 | ||
|
||
fn main() { | ||
let Foo { | ||
a, | ||
.. | ||
} = b; | ||
} |
10 changes: 10 additions & 0 deletions
10
tests/target/issue-5066/multi_line_struct_trailing_comma_never_struct_lit_width_0.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// rustfmt-trailing_comma: Never | ||
// rustfmt-struct_lit_single_line: false | ||
// rustfmt-struct_lit_width: 0 | ||
|
||
fn main() { | ||
let Foo { | ||
a, | ||
.. | ||
} = b; | ||
} |
10 changes: 10 additions & 0 deletions
10
tests/target/issue-5066/multi_line_struct_with_trailing_comma_always.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// rustfmt-trailing_comma: Always | ||
// rustfmt-struct_lit_single_line: false | ||
|
||
// There is an issue with how this is formatted. | ||
// formatting should look like ./multi_line_struct_trailing_comma_always_struct_lit_width_0.rs | ||
fn main() { | ||
let Foo { | ||
a, .. | ||
} = b; | ||
} |
10 changes: 10 additions & 0 deletions
10
tests/target/issue-5066/multi_line_struct_with_trailing_comma_never.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// rustfmt-trailing_comma: Never | ||
// rustfmt-struct_lit_single_line: false | ||
|
||
// There is an issue with how this is formatted. | ||
// formatting should look like ./multi_line_struct_trailing_comma_never_struct_lit_width_0.rs | ||
fn main() { | ||
let Foo { | ||
a, .. | ||
} = b; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
// rustfmt-trailing_comma: Always | ||
|
||
fn main() { | ||
let Foo { a, .. } = b; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
// rustfmt-trailing_comma: Never | ||
|
||
fn main() { | ||
let Foo { a, .. } = b; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#![rustfmt::skip] | ||
|
||
fn main() { | ||
println!("Hello, world!"); | ||
} | ||
|
||
// Trailing Comment |