diff --git a/src/tools/rustfmt/src/patterns.rs b/src/tools/rustfmt/src/patterns.rs
index 6fe2d4a8520e3..7bc699b07b0ce 100644
--- 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),
         }
     }
 }