Make closure capture independent of 2018 vs 2021 edition

dtolnay · dtolnay · commit d8587c23f1a6 · 2022-06-02T14:17:49.000-07:00
diff --git a/src/expand.rs b/src/expand.rs
@@ -355,7 +355,11 @@ fn transform_block(context: Context, sig: &mut Signature, block: &mut Block) {
                 } else {
                     let pat = &arg.pat;
                     let ident = positional_arg(i, pat);
-                    quote!(let #pat = #ident;)
+                    if let Pat::Wild(_) = **pat {
+                        quote!(let #ident = #ident;)
+                    } else {
+                        quote!(let #pat = #ident;)
+                    }
                 }
             }
         })

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,11 @@ fn transform_block(context: Context, sig: &mut Signature, block: &mut Block) {`
`355`	`355`	`} else {`
`356`	`356`	`let pat = &arg.pat;`
`357`	`357`	`let ident = positional_arg(i, pat);`
`358`		`- quote!(let #pat = #ident;)`
	`358`	`+ if let Pat::Wild(_) = **pat {`
	`359`	`+ quote!(let #ident = #ident;)`
	`360`	`+ } else {`
	`361`	`+ quote!(let #pat = #ident;)`
	`362`	`+ }`
`359`	`363`	`}`
`360`	`364`	`}`
`361`	`365`	`})`