Skip to content

Update Rustfmt (add let-else support) #113225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jul 1, 2023
+1,082 −50
Merged

Update Rustfmt (add let-else support) #113225

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
75870c5
Extract logic for rewriting `else` keyword into function
ytmimi Feb 12, 2023
9316df0
Initial pass at implementing let-else
ytmimi Jan 16, 2023
8be748d
Allow callers to determine if blocks can be formatted on a single line
ytmimi Feb 12, 2023
7a3e4fc
Implement `let-else` rewriting in terms of rewrite_let_else_block
ytmimi Feb 12, 2023
00fef2d
Implement wrapping rules to force `else` on a newline in `let-else`
ytmimi Feb 12, 2023
521f86b
Prevent single-line `let-else` if it would exceed `max_width`
ytmimi Mar 23, 2023
e4a9892
Add additional test cases
ytmimi Mar 23, 2023
9386b32
wrap `else {` for long, single-lined initializer expressions
ytmimi Apr 1, 2023
fe8b72d
implement single_line_let_else_max_width
ytmimi Apr 9, 2023
7b4e8a6
update `else_block_exceeds_width` calculation in `let-else` rewrite
ytmimi Jun 23, 2023
1de65a2
wrap `else` to next line if `let-else` pattern is multi-lined
ytmimi Jun 27, 2023
aa69148
Implement `become` expression formatting in rustfmt
WaffleLapkin May 9, 2023
23f48d9
deps: bump proc-macro2 and toolchain
calebcartwright Jul 1, 2023
3045c03
deps: bump proc-macro2 in config
calebcartwright Jul 1, 2023
dca1cf9
chore: prep v1.6.0 release
calebcartwright Jul 1, 2023
80ab662
Merge commit 'dca1cf90ad6b8e45afbed2061803befbb2d159e9' into sync-rus…
calebcartwright Jul 1, 2023
75a6675
update rustfmt version in lockfile
calebcartwright Jul 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: prep v1.6.0 release
@calebcartwright
calebcartwright committed Jul 1, 2023
commit dca1cf90ad6b8e45afbed2061803befbb2d159e9
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,17 @@

## [Unreleased]


## [1.6.0] 2023-07-02

### Added

- Support for formatting let-else statements [#5690]
- New config option, `single_line_let_else_max_width`, that allows users to configure the maximum length of 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 [#5684]

[#5690]: (https://github.com/rust-lang/rustfmt/pulls/5690)
[#5684]: https://github.com/rust-lang/rustfmt/issues/5684

## [1.5.3] 2023-06-20

### Fixed
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Original file line number Diff line number Diff line change
@@ -545,7 +545,7 @@ dependencies = [

[[package]]
name = "rustfmt-nightly"
version = "1.5.3"
version = "1.6.0"
dependencies = [
"annotate-snippets",
"anyhow",
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "rustfmt-nightly"
version = "1.5.3"
version = "1.6.0"
description = "Tool to find and fix Rust formatting issues"
repository = "https://github.com/rust-lang/rustfmt"
readme = "README.md"