Skip to content

Commit a603756

Browse files
committed
Temporary fix rustfmt for let-else
1 parent 20ddab3 commit a603756

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

src/items.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl Rewrite for ast::Local {
4848

4949
skip_out_of_file_lines_range!(context, self.span);
5050

51-
if contains_skip(&self.attrs) {
51+
if contains_skip(&self.attrs) || matches!(self.kind, ast::LocalKind::InitElse(..)) {
5252
return None;
5353
}
5454

@@ -97,7 +97,7 @@ impl Rewrite for ast::Local {
9797
infix.push_str(&rewrite);
9898
}
9999

100-
if self.init.is_some() {
100+
if self.kind.init().is_some() {
101101
infix.push_str(" =");
102102
}
103103

@@ -106,11 +106,12 @@ impl Rewrite for ast::Local {
106106

107107
result.push_str(&infix);
108108

109-
if let Some(ref ex) = self.init {
109+
if let Some((init, _els)) = self.kind.init_else_opt() {
110110
// 1 = trailing semicolon;
111111
let nested_shape = shape.sub_width(1)?;
112112

113-
result = rewrite_assign_rhs(context, result, &**ex, nested_shape)?;
113+
result = rewrite_assign_rhs(context, result, init, nested_shape)?;
114+
// todo else
114115
}
115116

116117
result.push(';');

tests/source/let_else.rs

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
fn main() {
2+
let Some(1) = Some(1) else { return };
3+
}

tests/target/let_else.rs

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
fn main() {
2+
let Some(1) = Some(1) else { return };
3+
}

0 commit comments

Comments
 (0)