Skip to content

Commit 5706be1

Browse files
NoratriebNoratrieb
committed
Improve spans for indexing expressions
Indexing is similar to method calls in having an arbitrary left-hand-side and then something on the right, which is the main part of the expression. Method calls already have a span for that right part, but indexing does not. This means that long method chains that use indexing have really bad spans, especially when the indexing panics and that span in coverted into a panic location. This does the same thing as method calls for the AST and HIR, storing an extra span which is then put into the `fn_span` field in THIR.
1 parent fcf3006 commit 5706be1

File tree

82 files changed

+192
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+192
-149
lines changed

‎compiler/rustc_ast/src/ast.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,8 @@ pub enum ExprKind {
14621462
/// Access of a named (e.g., `obj.foo`) or unnamed (e.g., `obj.0`) struct field.
14631463
Field(P<Expr>, Ident),
14641464
/// An indexing operation (e.g., `foo[2]`).
1465-
Index(P<Expr>, P<Expr>),
1465+
/// The span represents the span of the `[2]`, including brackets.
1466+
Index(P<Expr>, P<Expr>, Span),
14661467
/// A range (e.g., `1..2`, `1..`, `..2`, `1..=2`, `..=2`; and `..` in destructuring assignment).
14671468
Range(Option<P<Expr>>, Option<P<Expr>>, RangeLimits),
14681469
/// An underscore, used in destructuring assignment to ignore a value.

‎compiler/rustc_ast/src/mut_visit.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1400,14 +1400,15 @@ pub fn noop_visit_expr<T: MutVisitor>(
14001400
fn_decl,
14011401
body,
14021402
fn_decl_span,
1403-
fn_arg_span: _,
1403+
fn_arg_span,
14041404
}) => {
14051405
vis.visit_closure_binder(binder);
14061406
visit_constness(constness, vis);
14071407
vis.visit_asyncness(asyncness);
14081408
vis.visit_fn_decl(fn_decl);
14091409
vis.visit_expr(body);
14101410
vis.visit_span(fn_decl_span);
1411+
vis.visit_span(fn_arg_span);
14111412
}
14121413
ExprKind::Block(blk, label) => {
14131414
vis.visit_block(blk);
@@ -1420,9 +1421,10 @@ pub fn noop_visit_expr<T: MutVisitor>(
14201421
vis.visit_expr(expr);
14211422
vis.visit_span(await_kw_span);
14221423
}
1423-
ExprKind::Assign(el, er, _) => {
1424+
ExprKind::Assign(el, er, span) => {
14241425
vis.visit_expr(el);
14251426
vis.visit_expr(er);
1427+
vis.visit_span(span);
14261428
}
14271429
ExprKind::AssignOp(_op, el, er) => {
14281430
vis.visit_expr(el);
@@ -1432,9 +1434,10 @@ pub fn noop_visit_expr<T: MutVisitor>(
14321434
vis.visit_expr(el);
14331435
vis.visit_ident(ident);
14341436
}
1435-
ExprKind::Index(el, er) => {
1437+
ExprKind::Index(el, er, brackets_span) => {
14361438
vis.visit_expr(el);
14371439
vis.visit_expr(er);
1440+
vis.visit_span(brackets_span);
14381441
}
14391442
ExprKind::Range(e1, e2, _lim) => {
14401443
visit_opt(e1, |e1| vis.visit_expr(e1));

‎compiler/rustc_ast/src/util/parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ pub fn contains_exterior_struct_lit(value: &ast::Expr) -> bool {
390390
| ast::ExprKind::Cast(x, _)
391391
| ast::ExprKind::Type(x, _)
392392
| ast::ExprKind::Field(x, _)
393-
| ast::ExprKind::Index(x, _) => {
393+
| ast::ExprKind::Index(x, _, _) => {
394394
// &X { y: 1 }, X { y: 1 }.y
395395
contains_exterior_struct_lit(x)
396396
}

‎compiler/rustc_ast/src/visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
885885
visitor.visit_expr(subexpression);
886886
visitor.visit_ident(*ident);
887887
}
888-
ExprKind::Index(main_expression, index_expression) => {
888+
ExprKind::Index(main_expression, index_expression, _) => {
889889
visitor.visit_expr(main_expression);
890890
visitor.visit_expr(index_expression)
891891
}

‎compiler/rustc_ast_lowering/src/expr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
240240
ExprKind::Field(el, ident) => {
241241
hir::ExprKind::Field(self.lower_expr(el), self.lower_ident(*ident))
242242
}
243-
ExprKind::Index(el, er) => {
244-
hir::ExprKind::Index(self.lower_expr(el), self.lower_expr(er))
243+
ExprKind::Index(el, er, brackets_span) => {
244+
hir::ExprKind::Index(self.lower_expr(el), self.lower_expr(er), *brackets_span)
245245
}
246246
ExprKind::Range(Some(e1), Some(e2), RangeLimits::Closed) => {
247247
self.lower_expr_range_closed(e.span, e1, e2)

‎compiler/rustc_ast_pretty/src/pprust/state/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ impl<'a> State<'a> {
477477
self.word(".");
478478
self.print_ident(*ident);
479479
}
480-
ast::ExprKind::Index(expr, index) => {
480+
ast::ExprKind::Index(expr, index, _) => {
481481
self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX);
482482
self.word("[");
483483
self.print_expr(index);

‎compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
7979
| hir::ExprKind::Unary(hir::UnOp::Deref, inner)
8080
| hir::ExprKind::Field(inner, _)
8181
| hir::ExprKind::MethodCall(_, inner, _, _)
82-
| hir::ExprKind::Index(inner, _) = &expr.kind
82+
| hir::ExprKind::Index(inner, _, _) = &expr.kind
8383
{
8484
expr = inner;
8585
}

‎compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
567567
}
568568
};
569569
if let hir::ExprKind::Assign(place, rv, _sp) = expr.kind
570-
&& let hir::ExprKind::Index(val, index) = place.kind
570+
&& let hir::ExprKind::Index(val, index, _) = place.kind
571571
&& (expr.span == self.assign_span || place.span == self.assign_span)
572572
{
573573
// val[index] = rv;
@@ -620,7 +620,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
620620
);
621621
self.suggested = true;
622622
} else if let hir::ExprKind::MethodCall(_path, receiver, _, sp) = expr.kind
623-
&& let hir::ExprKind::Index(val, index) = receiver.kind
623+
&& let hir::ExprKind::Index(val, index, _) = receiver.kind
624624
&& expr.span == self.assign_span
625625
{
626626
// val[index].path(args..);

‎compiler/rustc_builtin_macros/src/assert/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ impl<'cx, 'a> Context<'cx, 'a> {
237237
ExprKind::If(local_expr, _, _) => {
238238
self.manage_cond_expr(local_expr);
239239
}
240-
ExprKind::Index(prefix, suffix) => {
240+
ExprKind::Index(prefix, suffix, _) => {
241241
self.manage_cond_expr(prefix);
242242
self.manage_cond_expr(suffix);
243243
}

‎compiler/rustc_hir/src/hir.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ impl Expr<'_> {
17541754

17551755
ExprKind::Unary(UnOp::Deref, _) => true,
17561756

1757-
ExprKind::Field(ref base, _) | ExprKind::Index(ref base, _) => {
1757+
ExprKind::Field(ref base, _) | ExprKind::Index(ref base, _, _) => {
17581758
allow_projections_from(base) || base.is_place_expr(allow_projections_from)
17591759
}
17601760

@@ -1831,7 +1831,7 @@ impl Expr<'_> {
18311831
ExprKind::Type(base, _)
18321832
| ExprKind::Unary(_, base)
18331833
| ExprKind::Field(base, _)
1834-
| ExprKind::Index(base, _)
1834+
| ExprKind::Index(base, _, _)
18351835
| ExprKind::AddrOf(.., base)
18361836
| ExprKind::Cast(base, _) => {
18371837
// This isn't exactly true for `Index` and all `Unary`, but we are using this
@@ -2015,7 +2015,9 @@ pub enum ExprKind<'hir> {
20152015
/// Access of a named (e.g., `obj.foo`) or unnamed (e.g., `obj.0`) struct or tuple field.
20162016
Field(&'hir Expr<'hir>, Ident),
20172017
/// An indexing operation (`foo[2]`).
2018-
Index(&'hir Expr<'hir>, &'hir Expr<'hir>),
2018+
/// Similar to [`ExprKind::MethodCall`], the final `Span` represents the span of the brackets
2019+
/// and index.
2020+
Index(&'hir Expr<'hir>, &'hir Expr<'hir>, Span),
20192021

20202022
/// Path to a definition, possibly containing lifetime or type parameters.
20212023
Path(QPath<'hir>),

‎compiler/rustc_hir/src/intravisit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr<'v>)
780780
visitor.visit_expr(subexpression);
781781
visitor.visit_ident(ident);
782782
}
783-
ExprKind::Index(ref main_expression, ref index_expression) => {
783+
ExprKind::Index(ref main_expression, ref index_expression, _) => {
784784
visitor.visit_expr(main_expression);
785785
visitor.visit_expr(index_expression)
786786
}

‎compiler/rustc_hir_pretty/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ impl<'a> State<'a> {
15261526
self.word(".");
15271527
self.print_ident(ident);
15281528
}
1529-
hir::ExprKind::Index(expr, index) => {
1529+
hir::ExprKind::Index(expr, index, _) => {
15301530
self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX);
15311531
self.word("[");
15321532
self.print_expr(index);
@@ -2419,7 +2419,7 @@ fn contains_exterior_struct_lit(value: &hir::Expr<'_>) -> bool {
24192419
| hir::ExprKind::Cast(x, _)
24202420
| hir::ExprKind::Type(x, _)
24212421
| hir::ExprKind::Field(x, _)
2422-
| hir::ExprKind::Index(x, _) => {
2422+
| hir::ExprKind::Index(x, _, _) => {
24232423
// `&X { y: 1 }, X { y: 1 }.y`
24242424
contains_exterior_struct_lit(x)
24252425
}

‎compiler/rustc_hir_typeck/src/expr.rs

+13-12
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
345345
self.check_expr_struct(expr, expected, qpath, fields, base_expr)
346346
}
347347
ExprKind::Field(base, field) => self.check_field(expr, &base, field, expected),
348-
ExprKind::Index(base, idx) => self.check_expr_index(base, idx, expr),
348+
ExprKind::Index(base, idx, brackets_span) => {
349+
self.check_expr_index(base, idx, expr, brackets_span)
350+
}
349351
ExprKind::Yield(value, ref src) => self.check_expr_yield(value, expr, src),
350352
hir::ExprKind::Err(guar) => Ty::new_error(tcx, guar),
351353
}
@@ -2840,6 +2842,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
28402842
base: &'tcx hir::Expr<'tcx>,
28412843
idx: &'tcx hir::Expr<'tcx>,
28422844
expr: &'tcx hir::Expr<'tcx>,
2845+
brackets_span: Span,
28432846
) -> Ty<'tcx> {
28442847
let base_t = self.check_expr(&base);
28452848
let idx_t = self.check_expr(&idx);
@@ -2873,7 +2876,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
28732876

28742877
let mut err = type_error_struct!(
28752878
self.tcx.sess,
2876-
expr.span,
2879+
brackets_span,
28772880
base_t,
28782881
E0608,
28792882
"cannot index into a value of type `{base_t}`",
@@ -2887,16 +2890,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
28872890
&& let ast::LitKind::Int(i, ast::LitIntType::Unsuffixed) = lit.node
28882891
&& i < types.len().try_into().expect("expected tuple index to be < usize length")
28892892
{
2890-
let snip = self.tcx.sess.source_map().span_to_snippet(base.span);
2891-
if let Ok(snip) = snip {
2892-
err.span_suggestion(
2893-
expr.span,
2894-
"to access tuple elements, use",
2895-
format!("{snip}.{i}"),
2896-
Applicability::MachineApplicable,
2897-
);
2898-
needs_note = false;
2899-
}
2893+
2894+
err.span_suggestion(
2895+
brackets_span,
2896+
"to access tuple elements, use",
2897+
format!(".{i}"),
2898+
Applicability::MachineApplicable,
2899+
);
2900+
needs_note = false;
29002901
} else if let ExprKind::Path(..) = idx.peel_borrows().kind {
29012902
err.span_label(idx.span, "cannot access tuple elements at a variable index");
29022903
}

‎compiler/rustc_hir_typeck/src/expr_use_visitor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
211211
self.select_from_expr(base);
212212
}
213213

214-
hir::ExprKind::Index(lhs, rhs) => {
214+
hir::ExprKind::Index(lhs, rhs, _) => {
215215
// lhs[rhs]
216216
self.select_from_expr(lhs);
217217
self.consume_expr(rhs);

‎compiler/rustc_hir_typeck/src/mem_categorization.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
336336
))
337337
}
338338

339-
hir::ExprKind::Index(ref base, _) => {
339+
hir::ExprKind::Index(ref base, _, _) => {
340340
if self.typeck_results.is_method_call(expr) {
341341
// If this is an index implemented by a method call, then it
342342
// will include an implicit deref of the result.

‎compiler/rustc_hir_typeck/src/place_op.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
284284
let mut exprs = vec![expr];
285285

286286
while let hir::ExprKind::Field(ref expr, _)
287-
| hir::ExprKind::Index(ref expr, _)
287+
| hir::ExprKind::Index(ref expr, _, _)
288288
| hir::ExprKind::Unary(hir::UnOp::Deref, ref expr) = exprs.last().unwrap().kind
289289
{
290290
exprs.push(expr);

‎compiler/rustc_hir_typeck/src/rvalue_scopes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn record_rvalue_scope_rec(
4040
hir::ExprKind::AddrOf(_, _, subexpr)
4141
| hir::ExprKind::Unary(hir::UnOp::Deref, subexpr)
4242
| hir::ExprKind::Field(subexpr, _)
43-
| hir::ExprKind::Index(subexpr, _) => {
43+
| hir::ExprKind::Index(subexpr, _, _) => {
4444
expr = subexpr;
4545
}
4646
_ => {

‎compiler/rustc_hir_typeck/src/writeback.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
210210
// to use builtin indexing because the index type is known to be
211211
// usize-ish
212212
fn fix_index_builtin_expr(&mut self, e: &hir::Expr<'_>) {
213-
if let hir::ExprKind::Index(ref base, ref index) = e.kind {
213+
if let hir::ExprKind::Index(ref base, ref index, _) = e.kind {
214214
// All valid indexing looks like this; might encounter non-valid indexes at this point.
215215
let base_ty = self.typeck_results.expr_ty_adjusted_opt(base);
216216
if base_ty.is_none() {

‎compiler/rustc_lint/src/unused.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ trait UnusedDelimLint {
653653
ExprKind::Call(fn_, _params) => fn_,
654654
ExprKind::Cast(expr, _ty) => expr,
655655
ExprKind::Type(expr, _ty) => expr,
656-
ExprKind::Index(base, _subscript) => base,
656+
ExprKind::Index(base, _subscript, _) => base,
657657
_ => break,
658658
};
659659
if !classify::expr_requires_semi_to_be_stmt(innermost) {
@@ -830,7 +830,7 @@ trait UnusedDelimLint {
830830
(value, UnusedDelimsCtx::ReturnValue, false, Some(left), None, true)
831831
}
832832

833-
Index(_, ref value) => (value, UnusedDelimsCtx::IndexExpr, false, None, None, false),
833+
Index(_, ref value, _) => (value, UnusedDelimsCtx::IndexExpr, false, None, None, false),
834834

835835
Assign(_, ref value, _) | AssignOp(.., ref value) => {
836836
(value, UnusedDelimsCtx::AssignedValue, false, None, None, false)

‎compiler/rustc_mir_build/src/thir/cx/expr.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,17 @@ impl<'tcx> Cx<'tcx> {
469469
}
470470
}
471471

472-
hir::ExprKind::Index(ref lhs, ref index) => {
472+
hir::ExprKind::Index(ref lhs, ref index, brackets_span) => {
473473
if self.typeck_results().is_method_call(expr) {
474474
let lhs = self.mirror_expr(lhs);
475475
let index = self.mirror_expr(index);
476-
self.overloaded_place(expr, expr_ty, None, Box::new([lhs, index]), expr.span)
476+
self.overloaded_place(
477+
expr,
478+
expr_ty,
479+
None,
480+
Box::new([lhs, index]),
481+
brackets_span,
482+
)
477483
} else {
478484
ExprKind::Index { lhs: self.mirror_expr(lhs), index: self.mirror_expr(index) }
479485
}

‎compiler/rustc_parse/src/parser/expr.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ impl<'a> Parser<'a> {
857857
let msg = format!(
858858
"cast cannot be followed by {}",
859859
match with_postfix.kind {
860-
ExprKind::Index(_, _) => "indexing",
860+
ExprKind::Index(..) => "indexing",
861861
ExprKind::Try(_) => "`?`",
862862
ExprKind::Field(_, _) => "a field access",
863863
ExprKind::MethodCall(_) => "a method call",
@@ -1304,7 +1304,10 @@ impl<'a> Parser<'a> {
13041304
let index = self.parse_expr()?;
13051305
self.suggest_missing_semicolon_before_array(prev_span, open_delim_span)?;
13061306
self.expect(&token::CloseDelim(Delimiter::Bracket))?;
1307-
Ok(self.mk_expr(lo.to(self.prev_token.span), self.mk_index(base, index)))
1307+
Ok(self.mk_expr(
1308+
lo.to(self.prev_token.span),
1309+
self.mk_index(base, index, open_delim_span.to(self.prev_token.span)),
1310+
))
13081311
}
13091312

13101313
/// Assuming we have just parsed `.`, continue parsing into an expression.
@@ -3366,8 +3369,8 @@ impl<'a> Parser<'a> {
33663369
ExprKind::Binary(binop, lhs, rhs)
33673370
}
33683371

3369-
fn mk_index(&self, expr: P<Expr>, idx: P<Expr>) -> ExprKind {
3370-
ExprKind::Index(expr, idx)
3372+
fn mk_index(&self, expr: P<Expr>, idx: P<Expr>, brackets_span: Span) -> ExprKind {
3373+
ExprKind::Index(expr, idx, brackets_span)
33713374
}
33723375

33733376
fn mk_call(&self, f: P<Expr>, args: ThinVec<P<Expr>>) -> ExprKind {

‎compiler/rustc_passes/src/liveness.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
10611061
self.propagate_through_expr(&l, ln)
10621062
}
10631063

1064-
hir::ExprKind::Index(ref l, ref r) | hir::ExprKind::Binary(_, ref l, ref r) => {
1064+
hir::ExprKind::Index(ref l, ref r, _) | hir::ExprKind::Binary(_, ref l, ref r) => {
10651065
let r_succ = self.propagate_through_expr(&r, succ);
10661066
self.propagate_through_expr(&l, r_succ)
10671067
}

‎compiler/rustc_resolve/src/late.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4269,7 +4269,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
42694269
ExprKind::ConstBlock(ref ct) => {
42704270
self.resolve_anon_const(ct, AnonConstKind::InlineConst);
42714271
}
4272-
ExprKind::Index(ref elem, ref idx) => {
4272+
ExprKind::Index(ref elem, ref idx, _) => {
42734273
self.resolve_expr(elem, Some(expr));
42744274
self.visit_expr(idx);
42754275
}

‎compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2854,7 +2854,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
28542854
err.note("all local variables must have a statically known size");
28552855
}
28562856
Some(Node::Local(hir::Local {
2857-
init: Some(hir::Expr { kind: hir::ExprKind::Index(_, _), span, .. }),
2857+
init: Some(hir::Expr { kind: hir::ExprKind::Index(..), span, .. }),
28582858
..
28592859
})) => {
28602860
// When encountering an assignment of an unsized trait, like

‎src/tools/clippy/clippy_lints/src/dereference.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ fn in_postfix_position<'tcx>(cx: &LateContext<'tcx>, e: &'tcx Expr<'tcx>) -> boo
800800
&& parent.span.ctxt() == e.span.ctxt()
801801
{
802802
match parent.kind {
803-
ExprKind::Call(child, _) | ExprKind::MethodCall(_, child, _, _) | ExprKind::Index(child, _)
803+
ExprKind::Call(child, _) | ExprKind::MethodCall(_, child, _, _) | ExprKind::Index(child, _, _)
804804
if child.hir_id == e.hir_id => true,
805805
ExprKind::Field(_, _) | ExprKind::Match(_, _, MatchSource::TryDesugar | MatchSource::AwaitDesugar) => true,
806806
_ => false,

‎src/tools/clippy/clippy_lints/src/functions/must_use.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ fn is_mutated_static(e: &hir::Expr<'_>) -> bool {
221221
match e.kind {
222222
Path(QPath::Resolved(_, path)) => !matches!(path.res, Res::Local(_)),
223223
Path(_) => true,
224-
Field(inner, _) | Index(inner, _) => is_mutated_static(inner),
224+
Field(inner, _) | Index(inner, _, _) => is_mutated_static(inner),
225225
_ => false,
226226
}
227227
}

0 commit comments

Comments
 (0)