Implement macro-based deref!() syntax for deref patterns

compiler-errors · compiler-errors · commit f670f3b5e05a · 2024-03-21T11:42:49.000-04:00
Stop using `box PAT` syntax for deref patterns, as it's misleading and
also causes their semantics being tangled up.
diff --git a/src/patterns.rs b/src/patterns.rs
@@ -55,9 +55,10 @@ fn is_short_pattern_inner(pat: &ast::Pat) -> bool {
         ast::PatKind::TupleStruct(_, ref path, ref subpats) => {
             path.segments.len() <= 1 && subpats.len() <= 1
         }
-        ast::PatKind::Box(ref p) | ast::PatKind::Ref(ref p, _) | ast::PatKind::Paren(ref p) => {
-            is_short_pattern_inner(&*p)
-        }
+        ast::PatKind::Box(ref p)
+        | PatKind::Deref(ref p)
+        | ast::PatKind::Ref(ref p, _)
+        | ast::PatKind::Paren(ref p) => is_short_pattern_inner(&*p),
         PatKind::Or(ref pats) => pats.iter().all(|p| is_short_pattern_inner(p)),
     }
 }
@@ -277,6 +278,7 @@ impl Rewrite for Pat {
                 .rewrite(context, shape.offset_left(1)?.sub_width(1)?)
                 .map(|inner_pat| format!("({})", inner_pat)),
             PatKind::Err(_) => None,
+            PatKind::Deref(_) => None,
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,10 @@ fn is_short_pattern_inner(pat: &ast::Pat) -> bool {`
`55`	`55`	`ast::PatKind::TupleStruct(_, ref path, ref subpats) => {`
`56`	`56`	`path.segments.len() <= 1 && subpats.len() <= 1`
`57`	`57`	`}`
`58`		`- ast::PatKind::Box(ref p) \| ast::PatKind::Ref(ref p, _) \| ast::PatKind::Paren(ref p) => {`
`59`		`- is_short_pattern_inner(&*p)`
`60`		`- }`
	`58`	`+ ast::PatKind::Box(ref p)`
	`59`	`+ \| PatKind::Deref(ref p)`
	`60`	`+ \| ast::PatKind::Ref(ref p, _)`
	`61`	`+ \| ast::PatKind::Paren(ref p) => is_short_pattern_inner(&*p),`
`61`	`62`	`PatKind::Or(ref pats) => pats.iter().all(\|p\| is_short_pattern_inner(p)),`
`62`	`63`	`}`
`63`	`64`	`}`
`@@ -277,6 +278,7 @@ impl Rewrite for Pat {`
`277`	`278`	`.rewrite(context, shape.offset_left(1)?.sub_width(1)?)`
`278`	`279`	`.map(\|inner_pat\| format!("({})", inner_pat)),`
`279`	`280`	`PatKind::Err(_) => None,`
	`281`	`+ PatKind::Deref(_) => None,`
`280`	`282`	`}`
`281`	`283`	`}`
`282`	`284`	`}`