fixes for rustfmt + ast visitor

dnbln · dnbln · commit df85b28b7261 · 2023-11-04T20:39:15.000+01:00
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
@@ -251,6 +251,9 @@ pub trait Visitor<'ast>: Sized {
     fn visit_inline_asm_sym(&mut self, sym: &'ast InlineAsmSym) {
         walk_inline_asm_sym(self, sym)
     }
+    fn visit_capture_by(&mut self, _capture_by: &'ast CaptureBy) {
+        // Nothing to do
+    }
 }
 
 #[macro_export]
@@ -857,7 +860,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
         }
         ExprKind::Closure(box Closure {
             binder,
-            capture_clause: _,
+            capture_clause,
             asyncness: _,
             constness: _,
             movability: _,
@@ -866,6 +869,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
             fn_decl_span: _,
             fn_arg_span: _,
         }) => {
+            visitor.visit_capture_by(capture_clause);
             visitor.visit_fn(FnKind::Closure(binder, fn_decl, body), expression.span, expression.id)
         }
         ExprKind::Block(block, opt_label) => {
diff --git a/src/tools/rustfmt/src/closures.rs b/src/tools/rustfmt/src/closures.rs
@@ -264,7 +264,7 @@ fn rewrite_closure_fn_decl(
         ""
     };
     let is_async = if asyncness.is_async() { "async " } else { "" };
-    let mover = if capture == ast::CaptureBy::Value {
+    let mover = if matches!(capture, ast::CaptureBy::Value { .. }) {
         "move "
     } else {
         ""
diff --git a/src/tools/rustfmt/src/expr.rs b/src/tools/rustfmt/src/expr.rs
@@ -368,7 +368,7 @@ pub(crate) fn format_expr(
             }
         }
         ast::ExprKind::Gen(capture_by, ref block, ref kind) => {
-            let mover = if capture_by == ast::CaptureBy::Value {
+            let mover = if matches!(capture_by, ast::CaptureBy::Value { .. }) {
                 "move "
             } else {
                 ""

Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,9 @@ pub trait Visitor<'ast>: Sized {`
`251`	`251`	`fn visit_inline_asm_sym(&mut self, sym: &'ast InlineAsmSym) {`
`252`	`252`	`walk_inline_asm_sym(self, sym)`
`253`	`253`	`}`
	`254`	`+ fn visit_capture_by(&mut self, _capture_by: &'ast CaptureBy) {`
	`255`	`+ // Nothing to do`
	`256`	`+ }`
`254`	`257`	`}`
`255`	`258`
`256`	`259`	`#[macro_export]`
`@@ -857,7 +860,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {`
`857`	`860`	`}`
`858`	`861`	`ExprKind::Closure(box Closure {`
`859`	`862`	`binder,`
`860`		`- capture_clause: _,`
	`863`	`+ capture_clause,`
`861`	`864`	`asyncness: _,`
`862`	`865`	`constness: _,`
`863`	`866`	`movability: _,`
`@@ -866,6 +869,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {`
`866`	`869`	`fn_decl_span: _,`
`867`	`870`	`fn_arg_span: _,`
`868`	`871`	`}) => {`
	`872`	`+ visitor.visit_capture_by(capture_clause);`
`869`	`873`	`visitor.visit_fn(FnKind::Closure(binder, fn_decl, body), expression.span, expression.id)`
`870`	`874`	`}`
`871`	`875`	`ExprKind::Block(block, opt_label) => {`
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ pub(crate) fn format_expr(`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`	`ast::ExprKind::Gen(capture_by, ref block, ref kind) => {`
`371`		`- let mover = if capture_by == ast::CaptureBy::Value {`
	`371`	`+ let mover = if matches!(capture_by, ast::CaptureBy::Value { .. }) {`
`372`	`372`	`"move "`
`373`	`373`	`} else {`
`374`	`374`	`""`