diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-17 17:22:32 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-17 17:22:32 +0100 |
| commit | ce926aebc4461e38535047958c0b6f72b7a0c0ea (patch) | |
| tree | 4b844e0681b459836bac22c34bee43e4dfa3dc5f /crates/ide/src/join_lines.rs | |
| parent | 3ae0c5911ab50ee209179ee4329b0551abe6fc48 (diff) | |
| parent | 02d25ab60d2701ce71fe2dfaca36627ad902e229 (diff) | |
Merge #9315
9315: Nest all the or-patterns! r=Veykril a=Veykril
`cargo +nightly clippy --fix -Z unstable-options --allow-dirty -- -A clippy::all -D clippy::unnested_or_patterns`
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/ide/src/join_lines.rs')
| -rw-r--r-- | crates/ide/src/join_lines.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs index 93d3760bf..ffa8bd182 100644 --- a/crates/ide/src/join_lines.rs +++ b/crates/ide/src/join_lines.rs | |||
| @@ -197,7 +197,7 @@ fn join_single_use_tree(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Opti | |||
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool { | 199 | fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool { |
| 200 | matches!((left, right), (T![,], T![')']) | (T![,], T![']'])) | 200 | matches!((left, right), (T![,], T![')'] | T![']'])) |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str { | 203 | fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str { |