cover guard patterns in rustfmt

max-niederman · Nadrieril · commit a3a29f50ef9f · 2024-11-24T19:42:33.000+01:00
diff --git a/src/tools/rustfmt/src/patterns.rs b/src/tools/rustfmt/src/patterns.rs
@@ -48,7 +48,8 @@ fn is_short_pattern_inner(pat: &ast::Pat) -> bool {
         | ast::PatKind::MacCall(..)
         | ast::PatKind::Slice(..)
         | ast::PatKind::Path(..)
-        | ast::PatKind::Range(..) => false,
+        | ast::PatKind::Range(..)
+        | ast::PatKind::Guard(..) => false,
         ast::PatKind::Tuple(ref subpats) => subpats.len() <= 1,
         ast::PatKind::TupleStruct(_, ref path, ref subpats) => {
             path.segments.len() <= 1 && subpats.len() <= 1
@@ -340,6 +341,7 @@ impl Rewrite for Pat {
                 .map(|inner_pat| format!("({})", inner_pat)),
             PatKind::Err(_) => Err(RewriteError::Unknown),
             PatKind::Deref(_) => Err(RewriteError::Unknown),
+            PatKind::Guard(..) => Err(RewriteError::Unknown),
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ fn is_short_pattern_inner(pat: &ast::Pat) -> bool {`
`48`	`48`	`\| ast::PatKind::MacCall(..)`
`49`	`49`	`\| ast::PatKind::Slice(..)`
`50`	`50`	`\| ast::PatKind::Path(..)`
`51`		`- \| ast::PatKind::Range(..) => false,`
	`51`	`+ \| ast::PatKind::Range(..)`
	`52`	`+ \| ast::PatKind::Guard(..) => false,`
`52`	`53`	`ast::PatKind::Tuple(ref subpats) => subpats.len() <= 1,`
`53`	`54`	`ast::PatKind::TupleStruct(_, ref path, ref subpats) => {`
`54`	`55`	`path.segments.len() <= 1 && subpats.len() <= 1`
`@@ -340,6 +341,7 @@ impl Rewrite for Pat {`
`340`	`341`	`.map(\|inner_pat\| format!("({})", inner_pat)),`
`341`	`342`	`PatKind::Err(_) => Err(RewriteError::Unknown),`
`342`	`343`	`PatKind::Deref(_) => Err(RewriteError::Unknown),`
	`344`	`+ PatKind::Guard(..) => Err(RewriteError::Unknown),`
`343`	`345`	`}`
`344`	`346`	`}`
`345`	`347`	`}`