Deadbeef
bb87a1b717
Rewrite float literals ending in dots with parens in method calls
2023-07-03 12:03:12 -05:00
Yacin Tmimi
fe8b72d98e
implement single_line_let_else_max_width
...
This allows users to configure the maximum length of a single line
`let-else` statements. `let-else` statements that otherwise meet the
requirements to be formatted on a single line will have their divergent
`else` block formatted over multiple lines if they exceed this length.
**Note**: `single_line_let_else_max_widt` will be introduced as a stable
configuration option.
2023-07-01 01:06:35 -05:00
Yacin Tmimi
9386b32f5a
wrap else {
for long, single-lined initializer expressions
...
This helps to prevent max width errors.
2023-06-20 08:26:11 -05:00
Yacin Tmimi
e4a9892b7a
Add additional test cases
...
These test cases try to cover various edge cases. For example, comments
around the else keyword and long, unbreakable, single-line initializer
expressions, and long patterns.
2023-06-20 08:26:11 -05:00
Yacin Tmimi
00fef2d51d
Implement wrapping rules to force else
on a newline in let-else
2023-06-20 08:26:11 -05:00
Yacin Tmimi
9316df0ca2
Initial pass at implementing let-else
2023-06-20 08:26:11 -05:00
Yacin Tmimi
75870c55b9
Extract logic for rewriting else
keyword into function
...
The function properly handles recovering comments before and after the
`else` keyword, and properly handles how to write the else when users
configure `control_brace_style`.
2023-06-20 08:26:11 -05:00
Caleb Cartwright
312a86b46b
Merge remote-tracking branch 'upstream/master' into subtree-sync-2023-06-19
2023-06-19 20:56:20 -05:00
Lukasz Anforowicz
f4201ef2cb
Handling of numbered markdown lists.
...
Fixes issue #5416
2023-06-19 20:50:01 -05:00
Yacin Tmimi
2c30fa5a82
Adjust enum variant spans to exclude any explicit discriminant
...
Fixes 5686
For reference, explicit discriminants were proposed in [RFC-2363].
`ast::Variant` spans extend to include explicit discriminants when they
are present.
Now we'll adjust the span of enum variants to exclude any explicit
discriminant.
[RFC-2363]: https://rust-lang.github.io/rfcs/2363-arbitrary-enum-discriminant.html
2023-06-19 10:12:19 -05:00
yukang
9d20134a78
remove rustfmt testcase for type ascription
2023-05-01 16:15:17 +08:00
yukang
a74d2d7440
fix tests
2023-05-01 16:15:17 +08:00
clubby789
a5ba6e025f
Remove uses of box_syntax
in rustc and tools
2023-03-12 13:19:46 +00:00
Rajiv Sharma
5391847ea5
Fix #5488 - prevent shorthand init for tuple struct
...
Closes #5488
Fix for #5488 . Before applying shorthand initialization for structs,
check if identifier is a literal (e.g. tuple struct). If yes, then do
not apply short hand initialization.
Added test case to validate the changes for the fix.
2023-02-01 21:33:19 -06:00
Thaqib
e2996a807b
Lists doc comments fix4041 ( #5560 )
...
* add + start of an itemized line
* add test
* fix format
* fix tests
* update doc comment
2023-02-01 21:26:12 -06:00
David Bar-On
b08130c590
Fix #5234 - handling of empty code block ( #5601 )
2023-01-29 12:55:14 -06:00
amab8901
bcfc57ec8a
added tests ( #5619 )
2023-01-28 15:18:52 -06:00
Caleb Cartwright
094b7f599c
Merge commit '1d8491b120223272b13451fc81265aa64f7f4d5b' into sync-from-rustfmt
2023-01-24 14:16:03 -06:00
Caleb Cartwright
e7d87ad61d
Merge remote-tracking branch 'upstream/master' into subtree-sync-2023-01-24
2023-01-23 21:19:31 -06:00
Albert Larsan
8c8aa3873f
Change src/test
to tests
in source files, fix tidy and tests
2023-01-11 09:32:13 +00:00
Jack Huey
748b031056
Stabilize GATs
2022-08-30 23:06:24 -04:00
Joshua Nelson
7852b8808b
Stabilize #![feature(label_break_value)]
...
# Stabilization proposal
The feature was implemented in https://github.com/rust-lang/rust/pull/50045 by est31 and has been in nightly since 2018-05-16 (over 4 years now).
There are [no open issues][issue-label] other than the tracking issue. There is a strong consensus that `break` is the right keyword and we should not use `return`.
There have been several concerns raised about this feature on the tracking issue (other than the one about tests, which has been fixed, and an interaction with try blocks, which has been fixed).
1. nrc's original comment about cost-benefit analysis: https://github.com/rust-lang/rust/issues/48594#issuecomment-422235234
2. joshtriplett's comments about seeing use cases: https://github.com/rust-lang/rust/issues/48594#issuecomment-422281176
3. withoutboats's comments that Rust does not need more control flow constructs: https://github.com/rust-lang/rust/issues/48594#issuecomment-450050630
Many different examples of code that's simpler using this feature have been provided:
- A lexer by rpjohnst which must repeat code without label-break-value: https://github.com/rust-lang/rust/issues/48594#issuecomment-422502014
- A snippet by SergioBenitez which avoids using a new function and adding several new return points to a function: https://github.com/rust-lang/rust/issues/48594#issuecomment-427628251 . This particular case would also work if `try` blocks were stabilized (at the cost of making the code harder to optimize).
- Several examples by JohnBSmith: https://github.com/rust-lang/rust/issues/48594#issuecomment-434651395
- Several examples by Centril: https://github.com/rust-lang/rust/issues/48594#issuecomment-440154733
- An example by petrochenkov where this is used in the compiler itself to avoid duplicating error checking code: https://github.com/rust-lang/rust/issues/48594#issuecomment-443557569
- Amanieu recently provided another example related to complex conditions, where try blocks would not have helped: https://github.com/rust-lang/rust/issues/48594#issuecomment-1184213006
Additionally, petrochenkov notes that this is strictly more powerful than labelled loops due to macros which accidentally exit a loop instead of being consumed by the macro matchers: https://github.com/rust-lang/rust/issues/48594#issuecomment-450246249
nrc later resolved their concern, mostly because of the aforementioned macro problems.
joshtriplett suggested that macros could be able to generate IR directly
(https://github.com/rust-lang/rust/issues/48594#issuecomment-451685983 ) but there are no open RFCs,
and the design space seems rather speculative.
joshtriplett later resolved his concerns, due to a symmetry between this feature and existing labelled break: https://github.com/rust-lang/rust/issues/48594#issuecomment-632960804
withoutboats has regrettably left the language team.
joshtriplett later posted that the lang team would consider starting an FCP given a stabilization report: https://github.com/rust-lang/rust/issues/48594#issuecomment-1111269353
[issue-label]: https://github.com/rust-lang/rust/issues?q=is%3Aissue+is%3Aopen+label%3AF-label_break_value+
## Report
+ Feature gate:
- d695a497bb/src/test/ui/feature-gates/feature-gate-label_break_value.rs
+ Diagnostics:
- 6b2d3d5f3c/compiler/rustc_parse/src/parser/diagnostics.rs (L2629)
- f65bf0b2bb/compiler/rustc_resolve/src/diagnostics.rs (L749)
- f65bf0b2bb/compiler/rustc_resolve/src/diagnostics.rs (L1001)
- 111df9e6ed/compiler/rustc_passes/src/loops.rs (L254)
- d695a497bb/compiler/rustc_parse/src/parser/expr.rs (L2079)
- d695a497bb/compiler/rustc_parse/src/parser/expr.rs (L1569)
+ Tests:
- https://github.com/rust-lang/rust/blob/master/src/test/ui/label/label_break_value_continue.rs
- https://github.com/rust-lang/rust/blob/master/src/test/ui/label/label_break_value_unlabeled_break.rs
- https://github.com/rust-lang/rust/blob/master/src/test/ui/label/label_break_value_illegal_uses.rs
- https://github.com/rust-lang/rust/blob/master/src/test/ui/lint/unused_labels.rs
- https://github.com/rust-lang/rust/blob/master/src/test/ui/run-pass/for-loop-while/label_break_value.rs
## Interactions with other features
Labels follow the hygiene of local variables.
label-break-value is permitted within `try` blocks:
```rust
let _: Result<(), ()> = try {
'foo: {
Err(())?;
break 'foo;
}
};
```
label-break-value is disallowed within closures, generators, and async blocks:
```rust
'a: {
|| break 'a
//~^ ERROR use of unreachable label `'a`
//~| ERROR `break` inside of a closure
}
```
label-break-value is disallowed on [_BlockExpression_]; it can only occur as a [_LoopExpression_]:
```rust
fn labeled_match() {
match false 'b: { //~ ERROR block label not supported here
_ => {}
}
}
macro_rules! m {
($b:block) => {
'lab: $b; //~ ERROR cannot use a `block` macro fragment here
unsafe $b; //~ ERROR cannot use a `block` macro fragment here
|x: u8| -> () $b; //~ ERROR cannot use a `block` macro fragment here
}
}
fn foo() {
m!({});
}
```
[_BlockExpression_]: https://doc.rust-lang.org/nightly/reference/expressions/block-expr.html
[_LoopExpression_]: https://doc.rust-lang.org/nightly/reference/expressions/loop-expr.html
2022-08-23 21:14:12 -05:00
A-Walrus
38659ec6ad
Unicode comment align ( #5505 )
...
* Fix comment alignment with unicode
Also added tests for this behaviour
* Simplify tests
* Improve tests
2022-08-18 18:44:29 -05:00
David Bar-On
ea017d7f84
Backport PR #4730 ( #5390 )
...
* Backport PR #4730 that fix issue #4689
* Test files for each Verion One and Two
* Simplify per review comment - use defer and matches!
* Changes per reviewer comments for reducing indentations
2022-08-09 09:30:49 -04:00
Caleb Cartwright
a392dd10cd
Merge remote-tracking branch 'upstream/master' into subtree-sync-2022-08-06
2022-08-06 19:07:02 -05:00
alexey semenyuk
662702eb54
Fix typos ( #5486 )
...
* Fix typos
* Fix typos
2022-08-06 18:53:03 -05:00
Yacin Tmimi
a7801aac27
Add test for issue 3987
...
Closes 3987
It's unclear which commit resolved this issue, but it can no longer be
reproduced.
2022-07-28 19:13:10 -05:00
Martin Juarez
ed77962d24
Improvements: Adding tests for the issue-4643.
2022-07-26 13:06:10 -04:00
Yacin Tmimi
4c78c738ba
Add tests for 3245 and 3561
...
Closes 3245
Closes 3561
These issues were originally linked in issue 3672 and as was mentioned
in PR 3706, it's unclear which commit resolved the issue but the issue
can no longer be reproduced.
2022-07-20 21:37:12 -05:00
Yacin Tmimi
0cb294f05c
Deprecate and Rename fn_args_layout
-> fn_params_layout
...
fn_args_layout is now deprecated.
This option was renamed to better communicate that it affects the layout
of parameters in function signatures and not the layout of arguments in
function calls.
Because the `fn_args_layout` is a stable option the renamed option is
also stable, however users who set `fn_args_layout` will get a warning
message letting them know that the option has been renamed.
2022-07-12 19:33:53 -05:00
Tom Milligan
c240f3a6b3
feat: add skip_macro_invocations option ( #5347 )
...
* feat: add skip_macro_names option
* [review] update configuration documentation
* [review] fix docstring
* [feat] implement wildcard macro invocation skip
* commit missed files
* [review] test override skip macro names
* [review] skip_macro_names -> skip_macro_invocations
* [review] expand doc configuration
* [review] add lots more tests
* [review] add use alias test examples
* [review] add link to standard macro behaviour
2022-07-12 19:31:19 -05:00
Maybe Waffle
f026688c2a
Add rustfmt test for formatting for<>
before closures
2022-07-12 21:00:13 +04:00
Yacin Tmimi
2403f827bf
Add test case for issue 1306 which was resolved
...
Closes 1306
It's unclear when the issue was fixed, but it cannot be reproduced.
2022-07-09 19:59:09 -05:00
Caleb Cartwright
ac595dd57a
Merge commit 'c4416f20dcaec5d93077f72470e83e150fb923b1' into sync-rustfmt
2022-06-22 22:14:32 -05:00
Yacin Tmimi
0156575a32
Revert "Memoize format_expr"
...
Fixes 5399
Memoizing expressions lead to cases where rustfmt's stability guarantees
were violated.
This reverts commit a37d3ab0e1
.
2022-06-22 17:45:42 -05:00
sec65
33c60740d3
Add width for codeblocks in comments ( #5372 )
...
* add doc_comment_code_block_width configuration
* updated config docu
* Updated docu and changed tests to config folder
2022-06-16 22:15:16 -05:00
Yacin Tmimi
e44380b341
Version gate raw identifier use statement sorting
...
When useing `version=One` rustfmt will treat the leading `r#` as part of
the `UseSegment` used for sorting. When using `version=Two` rustfmt will
ignore the leading `r#` and only consider the name of the identifier
when sorting the `UseSegment`.
2022-06-15 20:06:04 -05:00
Yacin Tmimi
5ae94cc6b8
Backport 3795
...
fix sorting of use statements with raw identifiers
2022-06-15 20:06:04 -05:00
Caleb Cartwright
d03a547cad
Merge commit '7b73b60faca71d01d900e49831fcb84553e93019' into sync-rustfmt
2022-06-12 22:03:05 -05:00
David Bar-On
7d34cfaf2c
Dedup imports_granularity = "Item"
( #4737 )
...
* Fix for issue 4725 - dedup Item imports_granularity (2nd version)
* Use unique() instead of unique_by()
2022-06-11 19:57:47 -05:00
Caleb Cartwright
1ac2ac0db6
Merge remote-tracking branch 'upstream/master' into subtree-sync-2022-06-07
2022-06-07 22:06:28 -05:00
Caleb Cartwright
79515f17ed
feat: remove license_template_path config option
2022-05-30 08:56:09 -05:00
Jacob Pratt
241a6f6930
Remove crate
visibility modifier in libs, tests
2022-05-21 00:32:47 -04:00
ydah
86940d2652
Fix typo
...
This PR is fixes typo "avaiable" to "available".
2022-05-20 10:39:10 +09:00
David Lattimore
95837832f4
import_granularity: Don't normalize imports with comments
2022-05-18 21:08:30 -05:00
Pascal Seitz
c65ba14d69
Fixes #5260
...
Fixes #5260 by checking if it is part of a type '::'
2022-05-08 13:22:35 -05:00
hkalbasi
a37d3ab0e1
Memoize format_expr
2022-04-17 09:32:43 -05:00
Tom Milligan
acdab00ecc
[review] check interaction with import grouping
2022-04-17 09:28:48 -05:00
Paul Gey
ba0351a146
Preserve attributes for imports_granularity=Item
...
Fixes #5030
2022-04-17 09:28:48 -05:00
Tom Milligan
4f3f87fb9a
group_imports: test and document non-consecutive imports
2022-04-11 17:46:33 -05:00