Skip to content

Commit 152a4e9

Browse files
borsbors
committed
Auto merge of #117585 - dnbln:feat/move-kw-span, r=cjgillot
Add the `Span` of the `move` keyword to the HIR. This is required to implement a lint like the one described here: rust-lang/rust-clippy#11721
2 parents 7a892ab + c077147 commit 152a4e9

File tree

14 files changed

+49
-20
lines changed

14 files changed

+49
-20
lines changed

Diff for: ‎compiler/rustc_ast/src/ast.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1548,7 +1548,10 @@ pub struct QSelf {
15481548
#[derive(Clone, Copy, PartialEq, Encodable, Decodable, Debug, HashStable_Generic)]
15491549
pub enum CaptureBy {
15501550
/// `move |x| y + x`.
1551-
Value,
1551+
Value {
1552+
/// The span of the `move` keyword.
1553+
move_kw: Span,
1554+
},
15521555
/// `move` keyword was not specified.
15531556
Ref,
15541557
}

Diff for: ‎compiler/rustc_ast/src/mut_visit.rs

+15-1
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,10 @@ pub trait MutVisitor: Sized {
302302
fn visit_format_args(&mut self, fmt: &mut FormatArgs) {
303303
noop_visit_format_args(fmt, self)
304304
}
305+
306+
fn visit_capture_by(&mut self, capture_by: &mut CaptureBy) {
307+
noop_visit_capture_by(capture_by, self)
308+
}
305309
}
306310

307311
/// Use a map-style function (`FnOnce(T) -> T`) to overwrite a `&mut T`. Useful
@@ -1397,7 +1401,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
13971401
}
13981402
ExprKind::Closure(box Closure {
13991403
binder,
1400-
capture_clause: _,
1404+
capture_clause,
14011405
constness,
14021406
asyncness,
14031407
movability: _,
@@ -1409,6 +1413,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
14091413
vis.visit_closure_binder(binder);
14101414
visit_constness(constness, vis);
14111415
vis.visit_asyncness(asyncness);
1416+
vis.visit_capture_by(capture_clause);
14121417
vis.visit_fn_decl(fn_decl);
14131418
vis.visit_expr(body);
14141419
vis.visit_span(fn_decl_span);
@@ -1562,6 +1567,15 @@ pub fn noop_visit_vis<T: MutVisitor>(visibility: &mut Visibility, vis: &mut T) {
15621567
vis.visit_span(&mut visibility.span);
15631568
}
15641569

1570+
pub fn noop_visit_capture_by<T: MutVisitor>(capture_by: &mut CaptureBy, vis: &mut T) {
1571+
match capture_by {
1572+
CaptureBy::Ref => {}
1573+
CaptureBy::Value { move_kw } => {
1574+
vis.visit_span(move_kw);
1575+
}
1576+
}
1577+
}
1578+
15651579
/// Some value for the AST node that is valid but possibly meaningless.
15661580
pub trait DummyAstNode {
15671581
fn dummy() -> Self;

Diff for: ‎compiler/rustc_ast/src/visit.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,9 @@ pub trait Visitor<'ast>: Sized {
251251
fn visit_inline_asm_sym(&mut self, sym: &'ast InlineAsmSym) {
252252
walk_inline_asm_sym(self, sym)
253253
}
254+
fn visit_capture_by(&mut self, _capture_by: &'ast CaptureBy) {
255+
// Nothing to do
256+
}
254257
}
255258

256259
#[macro_export]
@@ -857,7 +860,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
857860
}
858861
ExprKind::Closure(box Closure {
859862
binder,
860-
capture_clause: _,
863+
capture_clause,
861864
asyncness: _,
862865
constness: _,
863866
movability: _,
@@ -866,6 +869,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
866869
fn_decl_span: _,
867870
fn_arg_span: _,
868871
}) => {
872+
visitor.visit_capture_by(capture_clause);
869873
visitor.visit_fn(FnKind::Closure(binder, fn_decl, body), expression.span, expression.id)
870874
}
871875
ExprKind::Block(block, opt_label) => {

Diff for: ‎compiler/rustc_ast_lowering/src/item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
12011201
}
12021202

12031203
let async_expr = this.make_async_expr(
1204-
CaptureBy::Value,
1204+
CaptureBy::Value { move_kw: rustc_span::DUMMY_SP },
12051205
closure_id,
12061206
None,
12071207
body.span,

Diff for: ‎compiler/rustc_ast_pretty/src/pprust/state/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ impl<'a> State<'a> {
673673

674674
fn print_capture_clause(&mut self, capture_clause: ast::CaptureBy) {
675675
match capture_clause {
676-
ast::CaptureBy::Value => self.word_space("move"),
676+
ast::CaptureBy::Value { .. } => self.word_space("move"),
677677
ast::CaptureBy::Ref => {}
678678
}
679679
}

Diff for: ‎compiler/rustc_hir_pretty/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2017,7 +2017,7 @@ impl<'a> State<'a> {
20172017

20182018
fn print_capture_clause(&mut self, capture_clause: hir::CaptureBy) {
20192019
match capture_clause {
2020-
hir::CaptureBy::Value => self.word_space("move"),
2020+
hir::CaptureBy::Value { .. } => self.word_space("move"),
20212021
hir::CaptureBy::Ref => {}
20222022
}
20232023
}

Diff for: ‎compiler/rustc_hir_typeck/src/upvar.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
424424
origin = updated.1;
425425

426426
let (place, capture_kind) = match capture_clause {
427-
hir::CaptureBy::Value => adjust_for_move_closure(place, capture_kind),
427+
hir::CaptureBy::Value { .. } => adjust_for_move_closure(place, capture_kind),
428428
hir::CaptureBy::Ref => adjust_for_non_move_closure(place, capture_kind),
429429
};
430430

@@ -958,7 +958,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
958958
let ty = self.resolve_vars_if_possible(self.node_ty(var_hir_id));
959959

960960
let ty = match closure_clause {
961-
hir::CaptureBy::Value => ty, // For move closure the capture kind should be by value
961+
hir::CaptureBy::Value { .. } => ty, // For move closure the capture kind should be by value
962962
hir::CaptureBy::Ref => {
963963
// For non move closure the capture kind is the max capture kind of all captures
964964
// according to the ordering ImmBorrow < UniqueImmBorrow < MutBorrow < ByValue
@@ -1073,7 +1073,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10731073

10741074
match closure_clause {
10751075
// Only migrate if closure is a move closure
1076-
hir::CaptureBy::Value => {
1076+
hir::CaptureBy::Value { .. } => {
10771077
let mut diagnostics_info = FxIndexSet::default();
10781078
let upvars =
10791079
self.tcx.upvars_mentioned(closure_def_id).expect("must be an upvar");
@@ -1479,10 +1479,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
14791479
// If the data will be moved out of this place, then the place will be truncated
14801480
// at the first Deref in `adjust_upvar_borrow_kind_for_consume` and then moved into
14811481
// the closure.
1482-
hir::CaptureBy::Value if !place.deref_tys().any(Ty::is_ref) => {
1482+
hir::CaptureBy::Value { .. } if !place.deref_tys().any(Ty::is_ref) => {
14831483
ty::UpvarCapture::ByValue
14841484
}
1485-
hir::CaptureBy::Value | hir::CaptureBy::Ref => ty::UpvarCapture::ByRef(ty::ImmBorrow),
1485+
hir::CaptureBy::Value { .. } | hir::CaptureBy::Ref => {
1486+
ty::UpvarCapture::ByRef(ty::ImmBorrow)
1487+
}
14861488
}
14871489
}
14881490

Diff for: ‎compiler/rustc_parse/src/parser/expr.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2303,13 +2303,14 @@ impl<'a> Parser<'a> {
23032303
/// Parses an optional `move` prefix to a closure-like construct.
23042304
fn parse_capture_clause(&mut self) -> PResult<'a, CaptureBy> {
23052305
if self.eat_keyword(kw::Move) {
2306+
let move_kw_span = self.prev_token.span;
23062307
// Check for `move async` and recover
23072308
if self.check_keyword(kw::Async) {
23082309
let move_async_span = self.token.span.with_lo(self.prev_token.span.data().lo);
23092310
Err(errors::AsyncMoveOrderIncorrect { span: move_async_span }
23102311
.into_diagnostic(&self.sess.span_diagnostic))
23112312
} else {
2312-
Ok(CaptureBy::Value)
2313+
Ok(CaptureBy::Value { move_kw: move_kw_span })
23132314
}
23142315
} else {
23152316
Ok(CaptureBy::Ref)

Diff for: ‎compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2938,7 +2938,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
29382938
else {
29392939
bug!("expected closure in SizedClosureCapture obligation");
29402940
};
2941-
if let hir::CaptureBy::Value = closure.capture_clause
2941+
if let hir::CaptureBy::Value { .. } = closure.capture_clause
29422942
&& let Some(span) = closure.fn_arg_span
29432943
{
29442944
err.span_label(span, "this closure captures all values by move");

Diff for: ‎src/tools/clippy/clippy_lints/src/utils/author.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_ast::LitIntType;
77
use rustc_data_structures::fx::FxHashMap;
88
use rustc_hir as hir;
99
use rustc_hir::{
10-
ArrayLen, BindingAnnotation, Closure, ExprKind, FnRetTy, HirId, Lit, PatKind, QPath, StmtKind, TyKind,
10+
ArrayLen, BindingAnnotation, Closure, ExprKind, FnRetTy, HirId, Lit, PatKind, QPath, StmtKind, TyKind, CaptureBy
1111
};
1212
use rustc_lint::{LateContext, LateLintPass, LintContext};
1313
use rustc_session::declare_lint_pass;
@@ -479,6 +479,11 @@ impl<'a, 'tcx> PrintVisitor<'a, 'tcx> {
479479
movability,
480480
..
481481
}) => {
482+
let capture_clause = match capture_clause {
483+
CaptureBy::Value { .. } => "Value { .. }",
484+
CaptureBy::Ref => "Ref",
485+
};
486+
482487
let movability = OptionPat::new(movability.map(|m| format!("Movability::{m:?}")));
483488

484489
let ret_ty = match fn_decl.output {
@@ -487,7 +492,7 @@ impl<'a, 'tcx> PrintVisitor<'a, 'tcx> {
487492
};
488493

489494
bind!(self, fn_decl, body_id);
490-
kind!("Closure(CaptureBy::{capture_clause:?}, {fn_decl}, {body_id}, _, {movability})");
495+
kind!("Closure(CaptureBy::{capture_clause}, {fn_decl}, {body_id}, _, {movability})");
491496
chain!(self, "let {ret_ty} = {fn_decl}.output");
492497
self.body(body_id);
493498
},

Diff for: ‎src/tools/clippy/tests/ui/author/blocks.stdout

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ if let ExprKind::Block(block, None) = expr.kind
4040
{
4141
// report your lint here
4242
}
43-
if let ExprKind::Closure(CaptureBy::Value, fn_decl, body_id, _, None) = expr.kind
43+
if let ExprKind::Closure(CaptureBy::Value { .. }, fn_decl, body_id, _, None) = expr.kind
4444
&& let FnRetTy::DefaultReturn(_) = fn_decl.output
4545
&& expr1 = &cx.tcx.hir().body(body_id).value
46-
&& let ExprKind::Closure(CaptureBy::Value, fn_decl1, body_id1, _, Some(Movability::Static)) = expr1.kind
46+
&& let ExprKind::Closure(CaptureBy::Value { .. }, fn_decl1, body_id1, _, Some(Movability::Static)) = expr1.kind
4747
&& let FnRetTy::DefaultReturn(_) = fn_decl1.output
4848
&& expr2 = &cx.tcx.hir().body(body_id1).value
4949
&& let ExprKind::Block(block, None) = expr2.kind

Diff for: ‎src/tools/rustfmt/src/closures.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ fn rewrite_closure_fn_decl(
264264
""
265265
};
266266
let is_async = if asyncness.is_async() { "async " } else { "" };
267-
let mover = if capture == ast::CaptureBy::Value {
267+
let mover = if matches!(capture, ast::CaptureBy::Value { .. }) {
268268
"move "
269269
} else {
270270
""

Diff for: ‎src/tools/rustfmt/src/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ pub(crate) fn format_expr(
368368
}
369369
}
370370
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 { .. }) {
372372
"move "
373373
} else {
374374
""

Diff for: ‎tests/ui-fulldeps/pprust-expr-roundtrip.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fn iter_exprs(depth: usize, f: &mut dyn FnMut(P<Expr>)) {
130130
iter_exprs(depth - 1, &mut |e| {
131131
g(ExprKind::Closure(Box::new(Closure {
132132
binder: ClosureBinder::NotPresent,
133-
capture_clause: CaptureBy::Value,
133+
capture_clause: CaptureBy::Value { move_kw: DUMMY_SP },
134134
constness: Const::No,
135135
asyncness: Async::No,
136136
movability: Movability::Movable,

0 commit comments

Comments
 (0)